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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



David Aguilar wrote:
> On Sat, Dec 19, 2020 at 12:59 PM Felipe Contreras
> <felipe.contreras@xxxxxxxxx> wrote:
> > They don't have to rely on that failure, they can just turn off
> > mergetool.automerge.
> >
> >
> > But fine. Let's the perfect be the enemy of the good. That seems wise.
> 
> FWIW I'm in favor of having per-tool configuration precisely for
> custom mergetools that do things with custom file formats and benefit
> from having all of LOCAL REMOTE and BASE.

That's a preference, not an argument.

> I don't have to imagine these use cases, they are very real.

Show one.

> This design choice is also in alignment with the general
> mergetool/difftool per-tool configuration paradigm.  If we didn't
> support per-tool, then it would be inconsistent.

Can you do

 1. mergetool.vimdiff3.keepBackup
 2. mergetool.vimdiff3.keepTemporaries
 3. mergetool.vimdiff3.writeToTemp
 4. mergetool.vimdiff3.prompt

?

In fact the opposite is the case; not a *single* `mergetool.foo`
configuration can be done with `mergetool.<tool>.foo`.

-- 
Felipe Contreras



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux