changeset 3442 | 798bcde0c9c2 |
parent 3441 | ef2e990f9047 |
child 3578 | 3b4e00cba57a |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -412,8 +412,7 @@ def update(repo, node, branchmerge, forc repo.dirstate.setparents(fp1, fp2) repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) if not branchmerge: - print "yow!" - repo.opener("branch", "w").write(p1.branch() + "\n") + repo.opener("branch", "w").write(p2.branch() + "\n") return stats