[categories] [index] [all (527)] [latest]

1. Use FileMerge with git diff

   $ echo 'opendiff "$2" "$5" -merge "$5"' > ~/bin/opendiff-git.sh
   $ chmod a+x ~/bin/opendiff-git.sh
   $ git config --global diff.external ~/bin/opendiff-git.sh
   

   Now, git diff should open FileMerge:

   $ git diff