Skip to content

Instantly share code, notes, and snippets.

@palesz
Created August 23, 2012 16:19
Show Gist options
  • Save palesz/3438215 to your computer and use it in GitHub Desktop.
Save palesz/3438215 to your computer and use it in GitHub Desktop.
Git configuration to be able to use SourceGear DiffMerge
"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe" /title1="Old" "$1" /title2="New" "$2"
#!/bin/sh
"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe" --merge --result="$4" "$2" "$1" "$3" --title1="Theirs" --title2="Base/Merged" --title3="Mine"
[diff]
tool = sgdm
[difftool]
prompt = false
[difftool "sgdm"]
cmd = diffmerge_diff.sh
[mergetool]
prompt = false
keepBackup = false
[mergetool "sgdm"]
cmd = diffmerge_merge.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment