title: hg transplant fails - how do I 'fix up the merge' as it suggests?
body: <p>My branch2274 was branched from default. Rev. 415 was the first commit and it shares an ancestor with the rev. 412 on the default branch.</p>
  
  <p>Branch2274 is a bug fix which needs merging into default soon BUT I did a very silly thing - I merged in changes from a feature branch (at rev. 418)</p>
  
  <p>In simple terms, I need to undo whatever changes were brought in by rev. 418. There seems to be a lot of ways to attempt this but I'm struggling to get any of them to work:</p>
  
  <p>Mercurial queues attempt:</p>
  
  <p>I've tried importing revs 415, 416, 417, (skipping 418), 421, 428 into a patch queue so I can apply it to rev 425.</p>
  
  <p>Problem: tortoisehg will only allow me to import revs 428, 421 but importing 417 is greyed out but importing 418 just gives me the error "abort: cannot import merge revision 418"</p>
  
  <p>Transplant attempt:</p>
  
  <pre><code>patching file Portal/Instructor/Login.aspx.vb
  Hunk #1 FAILED at 18
  1 out of 1 hunks FAILED -- saving rejects to file Portal/Instructor/Login.aspx.vb.rej
  applying 66b6b089ee01
  abort: Fix up the merge and run hg transplant --continue
  patch failed to apply
  
  [command interrupted]
  </code></pre>
  
  <p>Login.aspx.vb has been changed on default and I understand why the merge has failed.</p>
  
  <p><strong>How do I 'fix up' the merge?</strong></p>
  
  <p><strong>Alternatively, is there a simpler way for me to take rev. 418 and tell mercurial to undo the changes it brought in with a new commit on case2274?</strong></p>