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

[Durham Goode]

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.

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.