Am 17.12.20 um 09:27 schrieb Felipe Contreras: > Johannes Sixt wrote: >> I'm mostly using WinMerge these days, and it can do what your patch >> does all by itself. > > Really? Because under Wine it doesn't look like it: > > 1. Before: https://snipboard.io/8JA5Oz.jpg > 2. After: https://snipboard.io/HUXnOg.jpg These show 3 panes, while mine shows only 2. And I think I know why: First, I seem to use an older version of WinMerge that does not support 3-way diffs. Second, I only run the merge tool via Git GUI, and it has its own tool drivers and completely bypasses git-mergetool. In particular, it invokes WinMerge in a way that it auto-merges the non-conflicted parts, whereas (the unpatched) git-mergetool does it differently such that it shows many more differences in the same merge situation. -- Hannes
