title: how to solve hg commit abort: Unresolve merged conflicts.?
body: <p>Hello everyone i am facing a serious problem i am going to describe the whole scenario.There is a branch <strong>abc</strong> on bitbucket i have cloned it in my system.</p>
  
  <p><code>hg clone -b abc &lt;link&gt;</code></p>
  
  <p>After that i have created a local branch <strong>xyz</strong> on which i have started working and use to add commit and push to remote.But now i have switch to <strong>abc</strong> branch and pull all the changes from remote <strong>abc</strong> no conflicts were there:</p>
  
  <p><code>hg pull</code></p>
  
  <p><code>hg update</code></p>
  
  <p><code>hg update xyz</code> (checkout to xyz branch)</p>
  
  <p>Then i merge <strong>abc</strong></p>
  
  <p><code>hg merge abc</code></p>
  
  <p>Solved all the conflicts and started my work again.</p>
  
  <p><code>hg status</code> shows me the list of all files <code>M</code></p>
  
  <p><code>hg add .</code></p>
  
  <pre><code>hg commit
  error: unresolved merged conflicts
  </code></pre>
  
  <p>I dont wanted to lose anything,i have copied all the files in which i have made changes after the merge.Will i lose all the merged changes by this command <code>hg update -C</code>.Please help me out to solve this really in a mess.</p>