title: How can I back out a merge in Mercurial and later remerge with that branch?
body: <p>I have two branches, default and branch1. By mistake one person in our team merged branch1 with default. The content in branch1 is not yet ready to merge with default (it contains a major rework of the build &amp; deploy environment).</p>
  
  <p>We did an experiment with 'hg backout', backing out the merge (not sure this is the right way to do it). Then the changes from branch1 gets deleted on default, which is fine - but we can not remerge with branch1. </p>
  
  <p>How should we solve this issue?</p>