[PATCH 11 of 11 V2] filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety

Durham Goode durham at fb.com
Mon Jul 7 17:38:01 CDT 2014


On 7/7/14, 3:34 PM, "FUJIWARA Katsunori" <foozy at lares.dti.ne.jp> wrote:

>
>At Mon, 7 Jul 2014 16:26:50 +0000,
>Durham Goode wrote:
>> 
>> On 7/5/14, 11:07 AM, "FUJIWARA Katsunori" <foozy at lares.dti.ne.jp> wrote:
>> 
>> >
>> >At Sun, 06 Jul 2014 03:00:10 +0900,
>> >FUJIWARA Katsunori wrote:
>> >> 
>> >> # HG changeset patch
>> >> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
>> >> # Date 1404583001 -32400
>> >> #      Sun Jul 06 02:56:41 2014 +0900
>> >> # Node ID f5d064452b9b7fa6c001c5f92baf7ae1c34fd8a0
>> >> # Parent  21eb3ac84075d72de5adc097f8fe4bfe1f66c1b8
>> >> filemerge: use 'basic' as the default of '[ui] mergemarkers' for
>>safety
>> >> 
>> >> 
>
>> Iʼm not familiar enough with encoding issues to think of a good
>> alternative here.
>
>IMHO, for safety of novice users who don't know well about encoding
>and/or Mercurial, '[ui] mergemarkers' should be 'basic' in default,
>even though 'detailed' marker looks rich and good (I think so, too).

K. I’d be disappointed to not provide the new experience by default, but I
can’t think of a solution. I’ll leave this up to Matt and crew to queue.



More information about the Mercurial-devel mailing list