Skip to content

Instantly share code, notes, and snippets.

@jsplink

jsplink/gist:76fdbbcb560d13816049

Created June 5, 2015 21:51
Show Gist options
  • Save jsplink/76fdbbcb560d13816049 to your computer and use it in GitHub Desktop.
Save jsplink/76fdbbcb560d13816049 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig
Raw
gistfile1.txt
[merge]
tool = extMerge
[mergetool "extMerge"]
cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = false
[diff]
external = extDiff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment