equal
deleted
inserted
replaced
806 self.ui.status("committing merge changeset\n") |
806 self.ui.status("committing merge changeset\n") |
807 new = new.keys() |
807 new = new.keys() |
808 new.sort() |
808 new.sort() |
809 if co == cn: cn = -1 |
809 if co == cn: cn = -1 |
810 |
810 |
811 edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new]) |
811 edittext = "\nHG: merge resolve\n" + \ |
|
812 "".join(["HG: changed %s\n" % f for f in new]) |
812 edittext = self.ui.edit(edittext) |
813 edittext = self.ui.edit(edittext) |
813 n = self.changelog.add(node, new, edittext, tr, co, cn) |
814 n = self.changelog.add(node, new, edittext, tr, co, cn) |
814 |
815 |
815 tr.close() |
816 tr.close() |
816 |
817 |