[issue3069] Internal merge should create 3-way conflict markers for conflicts, instead of only 2-way (like in version 1.9.3).

[Marijn Schouten]

New submission from Marijn Schouten <hkBst at gentoo.org>:

Internal merge should create 3-way conflict markers for conflicts, instead
of only 2-way (like in version 1.9.3).

Meanwhile, you can enable 3-way conflict markers by instead using diff3 and
configuring it in your .hgrc like so:

[ui]
merge = diff3

[merge-tools]
#
# NB !!! THE ORDER OF FILE ARGUMENTS TO diff3 IS IMPORTANT !!!
#
diff3.args = -mA -L local -L base -L other -- $local $base $other > $output
#diff3.args = -mA -L LOCAL -L BASE -L OTHER -- $local $base $other > $output
#diff3.args = -mA -L '*LOCAL* <<<<<<<' -L '*BASE* <|<|<|<' -L '*OTHER*
>>>>>>>' -- $local $base $other > $output

----------
messages: 17725
nosy: hkBst
priority: wish
status: unread
title: Internal merge should create 3-way conflict markers for conflicts, instead of only 2-way (like in version 1.9.3).

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3069>
____________________________________________________