You are talking about merge tool, yet you (and some other people with answers) are configuring it as a diff tool. To configure a merge tool, you’d need to use merge.tool and mergetool configurations instead of diff.tool and difftool, like this: git config –global merge.tool winmerge git config –replace –global mergetool.winmerge.cmd “\”C:\Program Files (x86)\WinMerge\WinMergeU.exe\” -e … Read more
At first glance, it does not seem possible to reuse an external diff tool session. The git-mergetool documentation clearly states: If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool.<tool>.trustExitCode can be set to true. Otherwise, git-mergetool will prompt the user to indicate … Read more
These sites were very helpful, almost, mergetool and difftool. I used the global configuration, but can be used by repository without problems. You just need to execute the following commands: git config –global merge.tool kdiff3 git config –global mergetool.kdiff3.path “C:/Program Files/KDiff3/bin/kdiff3.exe” git config –global mergetool.kdiff3.trustExitCode false git config –global diff.guitool kdiff3 git config –global difftool.kdiff3.path … Read more