title: Resolving conflicts: how to accept "their" changes automatically?
body: <p>When merging conflicting changes using <code>hg merge</code>, Mercurial inserts a set of markers into the files to be merged in my working copy like this:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; local
    version = 0.2
  =======
    version = 0.1
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; other
  </code></pre>
  
  <p>Then I manually edit all files marked as U from a list produced by <code>hg resolve --all -l</code> and then I tell mercurial I have resolved them by <code>hg resolve -m file1 file2 file3 ...</code></p>
  
  <p>In many situations I would like however accept either my-only or their-only changes on some conflicting files. I am thinking to create two simple sed/awk/whatever scripts named <code>accept-theirs.sh</code> and <code>accept-my.sh</code> or is there any "proper" way to do it?</p>