Mercurial > hg

changeset 3442:798bcde0c9c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix branch setting (and remove debugging message)
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:59:01 -0500
parents ef2e990f9047
children e6045fc3cd50
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 17 22:34:43 2006 -0500
+++ b/mercurial/merge.py	Tue Oct 17 22:59:01 2006 -0500
@@ -412,8 +412,7 @@
         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