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

[Matt Mackall]

On Thu, 2013-12-26 at 18:20 +0100, Giovanni Gherdovich wrote:
> Hello,
> 
> I am confused about the semantics of the command
> 
> `hg merge --tool=internal:other`
> 
> >From `hg help mergetools`
> 
> ::::
> :::: "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."

Its primary use is binary files (but there are in fact use cases for
text files too).

-- 
Mathematics is the supreme nostalgia of our time.