changeset 78 | 85f1f87dc8ff |
parent 67 | a182f2561c8e |
child 79 | 837d473d54d5 |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -808,7 +808,8 @@ class localrepository: new.sort() if co == cn: cn = -1 - edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new]) + edittext = "\nHG: merge resolve\n" + \ + "".join(["HG: changed %s\n" % f for f in new]) edittext = self.ui.edit(edittext) n = self.changelog.add(node, new, edittext, tr, co, cn)