DiffMerge git mergetool & difftool setup

gistfile1.txt

Install http://download-us.sourcegear.com/DiffMerge/4.2.0/DiffMerge_4.2.0.697.stable_x64.msi

// this is an adaptation of http://adventuresincoding.com/2010/04/how-to-setup-git-to-use-diffmerge

Then run the following commands from the git bash

git config --global merge.tool diffmerge

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

git config --global mergetool.diffmerge.trustExitCode true

git config --global mergetool.keepBackup false

git config --global diff.tool diffmerge

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