title: Avoid Mercurial adding Local/Other tags to original file when merging
body: <p>I am using mercurial via tortoiseHg (windows) as a source control management tool.</p>
  
  <p>I am used to merge using beyond a compare. Today, I have to perform a very complex merge and I just discovered a new feature (my client was updated some days ago) that is extremely annoying.</p>
  
  <p>When I have a conflit and ask Mercurial to take the "other" file and keep the original in a .orig file, the .orig is added with &lt;&lt;&lt;&lt;&lt;&lt;&lt; local and >>>>>>> other, but more than this, the other part is merged into the original one !!!</p>
  
  <p>The two parts are then unaligned and it's impossible to guarantee that the merge is OK because you have to review it line by line with no help from the comparision tool. (see screen below).</p>
  
  <p><a href="http://s13.postimg.org/yor6gno47/Untitled.jpg" rel="nofollow">http://s13.postimg.org/yor6gno47/Untitled.jpg</a></p>
  
  <p>I want to disable this feature, but so far, I am unable to do it. Thanks so much for help as this is furthermore blocking my work.</p>
  
  <p>Regards.</p>