Run this from your git BASH prompt. You will also need to make sure that the path to SourceGear's DiffMerge program, "sgdm.exe" in the current version, is included in the PATH environment variable. On 32bit versions of Windows that path defaults to, "C:\Program Files\SourceGear\Common\DiffMerge". On 64bit versions it'll default to, "C:\Program F…

git-diffmerge.sh

git config --global merge.tool diffmerge

git config --global mergetool.diffmerge.cmd "sgdm.exe --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"

git config --global mergetool.diffmerge.trustExitCode true

# If you want to disable git's backup file creation uncomment the following line.
# Otherwise you might need to add *.orig into your .gitignore to prevent them
# being added to your repository.

#git config --global mergetool.keepBackup false

git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd "sgdm.exe \$LOCAL \$REMOTE"