Resolving conflicts: how to accept “their” changes automatically?

Question

When merging conflicting changes using hg merge, Mercurial inserts a set of markers into the files to be merged in my working copy like this:

<&l         


        

Answer 1

Try this:

hg merge --tool 'internal:other'

See also hg help merge-tools for more information.

Answer 2

Use

hg resolve -t internal:other --all

to accept theirs and

hg resolve -t internal:local --all

to accept yours