Skip to content

Instantly share code, notes, and snippets.

@jchannon

jchannon/gist:16c4f198b8919fec27b4

Created September 28, 2015 09:34
Show Gist options
  • Save jchannon/16c4f198b8919fec27b4 to your computer and use it in GitHub Desktop.
Save jchannon/16c4f198b8919fec27b4 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[diff]
tool = diffmerge
[merge]
tool = diffmerge
[difftool "diffmerge"]
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' "$LOCAL" "$REMOTE"
[mergetool "diffmerge"]
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result="$PWD/$MERGED" "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE"
trustExitCode = true
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment