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

Seth House [off-list ref] writes:

I wasn't aware of this plubming when I wrote the initial shell-script
version of the technique. This is a much better approach (even *if*
there's a negligible performance penalty). This nicely avoids
UNIX/Windows line-ending surprises, and instead leans on
already-configured Git defaults for those. Plus the non-text files
benefit you mentioned is also huge.

quoted

as I understand "mergetool" is handed an
already conflicted state and asked to resolve it, it would not be
possible without at least looking at the stage #1 to recover the
base for folks who do not use diff3 style.

I feel strongly that LOCAL, REMOTE, and BASE should be left intact for
this reason, Also because they aid readers in understanding the
pre-conflicts versions of the file.

Well, good to see that we helped somebody who we do not see
regularly around here.  You should hang around here more often ;-)