Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 18, 2020, 02:30 UTC
Message-ID: <5fdc1436b6e44_f2faf2084f@natae.notmuch>
In-Reply-To: <deb42d8a-1ac6-7100-eba9-d75f7c8ba0d8@kdbg.org>

Johannes Sixt wrote:

Show 20 quoted lines

> 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.

So it makes sense that the users of "git mergetool" get the same benefits of the users of git-gui (with the proposed patch).

However, I'm trying to parse what git-gui is doing in git-gui/lib/mergetool.tcl, and I see nothing similar to automerging.

Plus, the arguments passed to the tool are completely different:

  "$merge_tool_path" -e -ub -wl \
    -dl "Theirs File" -dr "Mine File" "$REMOTE" "$LOCAL" "$MERGED"]

	"$merge_tool_path" -u -e -dl Local -dr Remote \
		"$LOCAL" "$REMOTE" "$MERGED"

It's not even gramatically correct.

Cheers.

-- 
Felipe Contreras