changeset 3862 | 46abbed02b2d |
parent 3786 | 6398ff7cb705 |
child 3881 | c0a12e6441a5 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -489,7 +489,6 @@ def update(repo, node, branchmerge, forc 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