Accept all external conflicting changes:
hg resolve -t internal:other --all
Discard external changes and accept all local ones:
hg resolve -t internal:local --all