Skip to content

Instantly share code, notes, and snippets.

@skrul
Created September 10, 2010 15:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save skrul/573809 to your computer and use it in GitHub Desktop.
Save skrul/573809 to your computer and use it in GitHub Desktop.
---> create ~/bin/git-diff-cmd.sh
#!/bin/sh
/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge -left "$2" -right "$5"
---> configure git
git config --global diff.external ~/bin/git-diff-cmd.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment