Skip to content

Instantly share code, notes, and snippets.

@karthiks
Created January 3, 2013 15:09
Show Gist options
  • Save karthiks/4444154 to your computer and use it in GitHub Desktop.
Save karthiks/4444154 to your computer and use it in GitHub Desktop.
Global .gitconfig settings for external diff/merge tool (Note: The order is important)
[mergetool "kdiff3"]
path = /usr/local/bin/kdiff3
keepBackup = false
trustExitCode = false
[mergetool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
keepBackup = false
trustExitCode = false
[merge]
tool = diffmerge
[difftool "kdiff3"]
path = /usr/local/bin/kdiff3
keepBackup = false
trustExitCode = false
[difftool "mvim"]
path = /usr/local/bin/mvim
keepBackup = false
trustExitCode = false
[difftool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/diffmerge $LOCAL $REMOTE
keepBackup = false
trustExitCode = false
[difftool]
prompt = false
[diff]
tool = diffmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment