Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 3862:46abbed02b2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use UTF-8 in .hg/branch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Dec 2006 20:35:28 -0200
parents 6398ff7cb705
children c0a12e6441a5
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Dec 10 23:03:53 2006 +0100
+++ b/mercurial/merge.py	Sun Dec 10 20:35:28 2006 -0200
@@ -489,7 +489,6 @@
         repo.dirstate.setparents(fp1, fp2)
         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
         if not branchmerge:
-            b = util.tolocal(p2.branch())
             repo.opener("branch", "w").write(p2.branch() + "\n")
 
     return stats