title: How to mark file as resolved using local/remote version
body: <p>I pulled one revision and tried to merge but hg couldn't make the merge. I know the right version is the local (or the remote...), so I do this:</p>
  
  <pre><code>hg heads
  hg revert file_path --rev right_rev
  hg resolve -m file_path
  ...
  </code></pre>
  
  <p>Is there an easier way to do this?
  Yes I know I should open the file, verify, manually resolve, bla bla bla</p>