[PATCH 1 of 5 V3] merge: add conflict marker formatter (BC)

[Pierre-Yves David]

On 05/13/2014 05:56 PM, Augie Fackler wrote:
>
> On May 13, 2014, at 12:51 PM, Durham Goode <durham at fb.com> wrote:
>
>> On 5/13/14, 1:34 AM, "Pierre-Yves David" <pierre-yves.david at ens-lyon.org>
>> wrote:
>>
>>>
>>>
>>> On 05/12/2014 05:47 PM, Durham Goode wrote:
>>>> # HG changeset patch
>>>> # User Durham Goode <durham at fb.com>
>>>> # Date 1399593022 25200
>>>> #      Thu May 08 16:50:22 2014 -0700
>>>> # Node ID 09732bdb2784d9402e278c36406819a98919c2ca
>>>> # Parent  697fba94dec9f192bd1fa877e2a98e3d10042fc6
>>>> merge: add conflict marker formatter (BC)
>>>>
>>>> Adds a conflict marker formatter that can produce custom conflict marker
>>>> descriptions. It can be set via merge.conflictmarkertemplate. The old
>>>> behavior
>>>> can be used still by setting merge.oldconflictmarkers=True.
>>>
>>> 1. Do not use "old" this will put the one doing the next update to this
>>> topic in trouble.
>>>
>>> Wouldn't that make more sense to have a it as:
>>>
>>> [merge-tools]
>>> internal:merge.conflictmarkers = simplest
>>
>> I don¹t like Œ= simplest¹ since there are no other values.
>> Œinternal:merge.basicconflictmarkers = True¹ perhaps.

Well, the would be obviously be another value.

could be basic/detailed. This leave the field open for other option if 
someone come with a better idea 3 year from now.

Or even in one week if we reusing the same option to includes the base:

    basic/detailed/withbase

>> That said, I don¹t really care what we name this thing.  If Matt wants to
>> chime in and deliver a final verdict, I¹m happy to update and resend.

Durham quite convinced me that exposing internal:merge to the user was ugly.

[ui]
mergemarkers=basic

> I'd be a fan of naming the conflict marker formats. I might call the existing one "traditional" or "basic".

The naming part will be fun.

The old version could be named "basic" or "1980th".

the new one could be named "detailed" or "templated"

leaning toward basic/detailed, but I love the message conveyed by "1980th"

-- 
Pierre-Yves David