Skip to content

Instantly share code, notes, and snippets.

@kenny-evitt

kenny-evitt/Git config for DiffMerge

Created August 5, 2015 16:49
Show Gist options
  • Save kenny-evitt/a412b2b9c6369c919f88 to your computer and use it in GitHub Desktop.
Save kenny-evitt/a412b2b9c6369c919f88 to your computer and use it in GitHub Desktop.
Download ZIP
Relevant lines from my .gitconfig for DiffMerge on Windows
Raw
Git config for DiffMerge
[merge]
tool = diffmerge
[mergetool "diffmerge"]
trustExitCode = true
cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment