How could I force mergetool GUI (KDiff3) to be always shown?
Git has –auto hard coded as a command-line option to KDiff3, which causes the GUI not to show up if all conflicts are auto-resolvable by KDiff3. In the KDiff3 settings you can specify command line options to ignore, but putting –auto there did not work for me. As a workaround I configured my own variant … Read more