Resolving conflicts: how to accept "their" changes automatically?
Solution 1:
Use
hg resolve -t internal:other --all
to accept theirs and
hg resolve -t internal:local --all
to accept yours
Solution 2:
Try this:
hg merge --tool 'internal:other'
See also hg help merge-tools for more information.