Hi, I used to use 'kdiff3' as my mergetool for git. I'm running git v 1.7.11.msysgit.1 on Windows 7 64 bits. It used to work for about 8 months up to this week.
I tried manually configuring my mergetool through these commands: $ git config --global mergetool kdiff3 Also, I checked my ~/.gitconfig file had the following content: (...) [merge] tool = kdiff3 [mergetool "kdiff3"] path = C:/Program Files (x86)/KDiff3/kdiff3.exe keepBackup = false trustExitCode = false [diff] guitool = kdiff3 [difftool "kdiff3"] path = c:/Program Files (x86)/KDiff3/kdiff3.exe I can start kdiff3 from the command prompt without any issue: I added the path to kdiff3.exe in my PATH env variable. Any ideas what could cause my problem and how to fix it? Cheers, -- Eric Parent <mailto:e...@eparent.info> -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to firstname.lastname@example.org. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.