non-graphical merge tool

[Dave S]

On Wed, May 14, 2014 at 11:13 PM, Pierre-Yves David <
pierre-yves.david at ens-lyon.org> wrote:

>
>
> On 05/14/2014 07:07 PM, Dave S wrote:
>
>>
>> Maybe use the "internal:fail" merge-tool, and then hg resolve -l ?
>> (easily done with a .bat or .sh file)
>>
>

>
> "internal:fail"? that sounds fairly sub-optimal. The one that leave
> conflict marker around is "internal:merge"
>
>
>
Yeah, I should have done  "hg help merge-tools" before posting.  A good
reminder, thanks.

/dps


-- 
test signature -- please apply at front gate on Tuesdays only.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140516/8e168304/attachment-0002.html>