Merging

[Mads Kiilerich]

On 06/11/2010 02:58 AM, Pierre Asselin wrote:
> Matt Mackall<mpm at selenic.com>  wrote:
>
>> To have the internal merge with the conflict markers for example in
>> TortoiseHg set
>
>> [ui]
>> merge = internal:merge
>
>> in Mercurial.ini.
>
> Matt, is there a way to get three-way conflict markers,
>      <<<<  local |||| base ==== other>>>>
> instead of the two-way conflict
>      <<<<  local ==== other>>>>
> generated by internal:merge ?

Nothing has changed here since
http://www.selenic.com/pipermail/mercurial/2009-January/023504.html ;-)

/Mads