Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views
Show 11 quoted lines
> On Thu, Dec 17, 2020 at 04:35:29AM -0600, Felipe Contreras wrote:
> > If you want to see the original LOCAL, REMOTE, and BASE, you can turn
> > off that option (or simply never turn it on).
>
> Agreed.
>
> Felipe, the functionality in the v3 version of your patch looks good to
> me and I think it's well worth including in upstream Git.
>
> Would you mind switching the autoMerge option to be per-tool rather than
> under the main mergetool config section?
As I said; I don't see the point.
Even if I were using diffconflict, I would want this option on.
So it's not a tool configuration; it's a user preference.
> You're right that it will likely not cause any downstream errors; it's
> just a difference in preference. The tools that perform their own
> conflict resolution will likely want it off
What tools would that be?
--
Felipe Contreras
Felipe Contreras <felipe.contreras@gmail.com>