Skip to content

Instantly share code, notes, and snippets.

@dalehenrich

dalehenrich/gitMergeTool.md

Created May 2, 2012 18:23
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 dalehenrich/2578939 to your computer and use it in GitHub Desktop.
Save dalehenrich/2578939 to your computer and use it in GitHub Desktop.
Download ZIP
git merge stuff
Raw
gitMergeTool.md

source....

ubuntu:

git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "/usr/bin/diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.keepBackup false

mac:

git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "/Applications/DiffMerge.app/Contents/MacOS/diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.keepBackup false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment