# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1161143941 18000
# Node ID 798bcde0c9c272b83b297cbb183afb3fba43aca2
# Parent  ef2e990f9047d1fe91bc4c5a778daeecc17663f4
merge: fix branch setting

(and remove debugging message)

diff -r ef2e990f9047 -r 798bcde0c9c2 mercurial/merge.py
--- 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