Setup guide for making Git recognize and use SourceGear DiffMerge.

Setting up SourceGear DiffMerge for Git.md

1. Download SourceGear DiffMerge: http://sourcegear.com/diffmerge/index.html

2. Add the following to your global .gitconfig file:

    [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
   

After following these steps, you can run git difftool and git mergetool to open SourceGear DiffMerge from the Git Bash prompt.

Thanks @gvdwiele, I will try that out. I'm all about simpler ways to do things :-)

For Step 4 - The .gitconfig is located in the User/[UserName]/ root folder

I've updated the gist with the suggestions from @gvdwiele. Thanks!

As of version 3.3, DiffMerge returns a proper exit code. Therefore, trustExitCode should be set to true.

This worked great for me. Thanks.