====== Mercurial Commands ======

Accept all external conflicting changes:
<code>
hg resolve -t internal:other --all
</code>

Discard external changes and accept all local ones:
<code>
hg resolve -t internal:local --all
</code>