Skip to content

Instantly share code, notes, and snippets.

@stuartd

stuartd/gist:e45bc1de39ca59d7bfaa50869884328e

Last active June 3, 2019 16:52
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stuartd/e45bc1de39ca59d7bfaa50869884328e to your computer and use it in GitHub Desktop.
Save stuartd/e45bc1de39ca59d7bfaa50869884328e to your computer and use it in GitHub Desktop.
Download ZIP
Diffmerge settings
Raw
gistfile1.txt
Command:
C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Compare:
/title1=%6 /title2=%7 %1 %2
Merge:
/title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2
@stuartd
Copy link
Author

stuartd commented Jun 3, 2019

Git config:

[diff]
    tool = DiffMerge
[difftool "DiffMerge"]
    cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' "$LOCAL" "$REMOTE"

[merge]
    tool = DiffMerge
	
[mergetool "DiffMerge"]
    cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result="$PWD/$MERGED" "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE"
trustExitCode = true

[mergetool]
    keepBackup = false

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment