Mercurial > hg

diff mercurial/commands.py @ 7848:89e05c02a4af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 30cb79d84352
children 74c3baca65c9
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Mar 16 16:58:41 2009 -0500
+++ b/mercurial/commands.py	Mon Mar 16 16:58:41 2009 -0500
@@ -645,9 +645,6 @@
     elif ui.verbose:
         ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
 
-    ms = merge_.mergestate(repo)
-    ms.reset(node)
-
 def copy(ui, repo, *pats, **opts):
     """mark files as copied for the next commit