title: Mercurial / hg - abort: outstanding uncommitted merges
body: <p>I have a master repo on host1 and made an update to a repo on host2.  I <code>hg push</code>ed the changes from host2 to host1 with</p>
  
  <pre><code>[mpenning@host2 login]$  hg push ssh://host1//opt/python/login
  </code></pre>
  
  <p>However, when I try to update or merge, I get</p>
  
  <pre><code>[mpenning@host1 login]$ hg update
  abort: outstanding uncommitted merges
  [mpenning@host1 login]$ hg merge
  abort: outstanding uncommitted merges
  [mpenning@host1 login]$ 
  </code></pre>
  
  <p>I also tried a <code>hg pull</code> from host1, but that didn't work either...</p>
  
  <pre><code>[mpenning@host1 login]$ hg pull ssh://host2//opt/python/login
  running ssh host2 'hg -R /opt/python/login serve --stdio'
  mpenning@host2's password:
  pulling from ssh://host2//opt/python/login
  searching for changes
  no changes found
  [mpenning@host1 login]$ hg merge
  abort: outstanding uncommitted merges
  [mpenning@host1 login]$
  </code></pre>
  
  <p>What do I need to do to update my master repo on host1 with the changes from host2?</p>
  
  <hr>
  
  <p>More information about the repo on host1...</p>
  
  <pre><code>[mpenning@host1 login]$ hg parents
  changeset:   27:6d530d533997
  user:        Mike Pennington &lt;d.pennington@foo.local&gt;
  date:        Wed Sep 26 11:44:51 2012 -0500
  files:       mp_getconf.py
  description:
  fix issue where config retrieval was broken
  
  
  changeset:   29:eaf3b5aacfe6
  user:        Mike Pennington &lt;d.pennington@foo.local&gt;
  date:        Wed Sep 26 11:43:15 2012 -0500
  files:       mp_getconf.py
  description:
  fix artifact of using the script to run generic commands, but this broke config retrieval
  
  
  [mpenning@host1 login]$
  </code></pre>