[PATCH 5 of 6] simplemerge: add ``base`` mode to ``mergemarkersscope`` config

[Pierre-Yves David]

On 06/10/2014 03:16 PM, Siddharth Agarwal wrote:
> On 06/10/2014 01:50 PM, pierre-yves.david at ens-lyon.org wrote:
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
>> # Date 1348740176 -7200
>> #      Thu Sep 27 12:02:56 2012 +0200
>> # Node ID fe435e1caaab581f4c67ea44c7075f38e7102575
>> # Parent  9282f318c729d672c05fd3364b8d2fce80ecac3b
>> simplemerge: add ``base`` mode to ``mergemarkersscope`` config
>
> Following on from my earlier comment, this seems to be orthogonal to
> minimal vs plain, doesn't it? Minimal + base and plain + base both make
> sense.

No, ``minimal`` is incompatible with ``base``. ``minimal`` simplify 
content that are differ from "base" but is the same in "local" and 
"other". If the content is the same in all of "base", "other" and 
"local" there is no conflict in the first place.

So, displaying the base means no minimization.


-- 
Pierre-Yves David