changeset 7739 | edcb56991afe |
parent 7737 | 26bdb7109170 |
parent 7734 | 9f73bddb9d0b |
child 7743 | ec9b726a9428 |
--- a/mercurial/commands.py Sat Feb 07 18:46:13 2009 +0100 +++ b/mercurial/commands.py Sat Feb 07 23:29:12 2009 +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