Can TortoiseMerge be used as a difftool with Windows Git Bash?
The following settings work fine for me. However, I am using TortoiseGit not TortoiseSVN. Notice the difference in the parameters for diff. [diff] tool = tortoisediff [difftool] prompt = false [merge] tool = tortoisemerge [mergetool] prompt = false keepBackup = false [difftool “tortoisediff”] cmd = \””c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe”\” -mine “$REMOTE” -base “$LOCAL” [mergetool “tortoisemerge”] cmd = … Read more