title: How to resolve merging conflicts in Mercurial (v1.0.2)?
body: <p>I have a merging conflict, using Mercurial 1.0.2:</p>
  
  <pre><code>merging test.h
  warning: conflicts during merge.
  merging test.h failed!
  6 files updated, 0 files merged, 0 files removed, 1 files unresolved
  There are unresolved merges, you can redo the full merge using:
    hg update -C 19
    hg merge 18
  </code></pre>
  
  <p>I can't figure out how to resolve this. Google search results instruct to use:</p>
  
  <pre><code>hg resolve
  </code></pre>
  
  <p>but for some reason my Mercurial (v1.0.2) doesn't have a resolve command:</p>
  
  <pre><code>hg: unknown command 'resolve'
  </code></pre>
  
  <p>How can I resolve this conflict?</p>