Show More
@@ -762,7 +762,7 b' class localrepository(repo.repository):' | |||||
762 | if p2 != nullid: |
|
762 | if p2 != nullid: | |
763 | edittext.append("HG: branch merge") |
|
763 | edittext.append("HG: branch merge") | |
764 | if branchname: |
|
764 | if branchname: | |
765 | edittext.append("HG: branch %s" % branchname) |
|
765 | edittext.append("HG: branch %s" % util.tolocal(branchname)) | |
766 | edittext.extend(["HG: changed %s" % f for f in changed]) |
|
766 | edittext.extend(["HG: changed %s" % f for f in changed]) | |
767 | edittext.extend(["HG: removed %s" % f for f in removed]) |
|
767 | edittext.extend(["HG: removed %s" % f for f in removed]) | |
768 | if not changed and not remove: |
|
768 | if not changed and not remove: |
General Comments 0
You need to be logged in to leave comments.
Login now