Skip to content

Instantly share code, notes, and snippets.

@timcharper

timcharper/.gitconfig

Created September 18, 2009 20:47
Show Gist options
  • Save timcharper/189279 to your computer and use it in GitHub Desktop.
Save timcharper/189279 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[mergetool "diffmerge"]
cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
trustExitCode = false
[merge]
tool = diffmerge
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment