Here’s the configuration I use to get DiffMerge working with Git Bash.
DiffMerge should already be installed into its default directory (otherwise you will have to edit the shell files available below).
If it doesn’t already exist, create the file .gitconfig in C:/Users/<your username>/ and copy the following content:
[merge] tool = diffmerge [diff] tool = diffmerge [mergetool] keepBackup = false [mergetool "diffmerge"] cmd = git-mergetool-diffmerge-wrapper.sh "$LOCAL" "$BASE" "$REMOTE" "$MERGED" [difftool "diffmerge"] cmd = git-difftool-diffmerge-wrapper.sh "$LOCAL" "$REMOTE" [user] name = Andre Odendaal email = firstname.lastname@example.org [difftool] prompt = false
Change the name to your name and the email to the email you use for your repository.
Next download and unzip these wrapper files into C:/Program Files/git/cmd/
And you should be good to go!