changeset 4021 | 1590558e9f60 |
parent 4020 | dbf250b80cc2 |
child 4022 | bf329bda51a6 |
--- a/mercurial/localrepo.py Thu Jan 11 19:47:51 2007 +0100 +++ b/mercurial/localrepo.py Thu Jan 11 23:12:21 2007 +0100 @@ -762,7 +762,7 @@ if p2 != nullid: edittext.append("HG: branch merge") if branchname: - edittext.append("HG: branch %s" % branchname) + edittext.append("HG: branch %s" % util.tolocal(branchname)) edittext.extend(["HG: changed %s" % f for f in changed]) edittext.extend(["HG: removed %s" % f for f in removed]) if not changed and not remove: