changeset 7734 | 9f73bddb9d0b |
parent 7695 | deec6628e62b |
child 7739 | edcb56991afe |
--- a/mercurial/commands.py Wed Jan 28 14:27:44 2009 -0600 +++ b/mercurial/commands.py Thu Dec 25 10:42:01 2008 +0100 @@ -645,6 +645,9 @@ 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