merge-tool "internal:other", I don't quite get it

[Giovanni Gherdovich]

2013/12/26 Matt Mackall <mpm at selenic.com>
::::
::::     On Thu, 2013-12-26 at 18:20 +0100, Giovanni Gherdovich wrote:
::::     > ...
::::     >
::::     > ::::
::::     > :::: "internal:other"
::::     > ::::  Uses the other version of files as the merged version.
::::     > ::::
::::     And this is what your example shows. Mercurial says "these
versions have
::::     some sort of conflict, but user has specified 'internal:other', so
skip
::::     any sort of line-level merge and give back the 'other' version of
the
::::     file."

Hello Matt,

thank you for your reply.
Indeed, reading the help again it says "other version of files".

Cheers,
GGhh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20131226/5340f742/attachment-0002.html>