Mercurial > hg > gitserve
changeset 3260:168485fa44ba
merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 04 Oct 2006 22:07:03 +0200 |
parents | 1e2941fda520 (current diff) 7a0d70b69d74 (diff) |
children | 03acd01520ac |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Oct 04 12:39:51 2006 -0700 +++ b/mercurial/merge.py Wed Oct 04 22:07:03 2006 +0200 @@ -379,8 +379,8 @@ # update dirstate if not partial: + recordupdates(repo, action, branchmerge) repo.dirstate.setparents(p1.node(), p2.node()) - recordupdates(repo, action, branchmerge) if show_stats: stats = ((updated, _("updated")),