Skip to content

Instantly share code, notes, and snippets.

@bkrauska

bkrauska/gist:9742260

Last active August 4, 2022 06:57
Show Gist options
  • Save bkrauska/9742260 to your computer and use it in GitHub Desktop.
Save bkrauska/9742260 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"
@mikhail-chystsiakou
Copy link

Thanks, it works!

@omerts
Copy link

omerts commented Nov 19, 2017 •
edited
Loading

I am getting this error:

File ($Local) not found. File ($BASE) not found. File ($REMOTE) not found.

This solved it for me (windows 10):

git config --global mergetool.diffmerge.cmd 
    "C:/Program\ Files/SourceGear/Common/DiffMerge/sgdm.exe
        -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\""

@lavakummarr
Copy link

Thank you ,its working

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment