Skip to content

Instantly share code, notes, and snippets.

@lshaf

lshaf/gist:ccb68322b5d118085b0193414869f223

Forked from bkrauska/gist:9742260
Created September 10, 2019 04:33
Show Gist options
  • Save lshaf/ccb68322b5d118085b0193414869f223 to your computer and use it in GitHub Desktop.
Save lshaf/ccb68322b5d118085b0193414869f223 to your computer and use it in GitHub Desktop.
Download ZIP
DiffMerge git mergetool & difftool setup
Raw
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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment