Show More
@@ -837,11 +837,11 b' class localrepository(repo.repository):' | |||||
837 | raise util.Abort(_("unresolved merge conflicts " |
|
837 | raise util.Abort(_("unresolved merge conflicts " | |
838 | "(see hg resolve)")) |
|
838 | "(see hg resolve)")) | |
839 |
|
839 | |||
840 |
|
|
840 | cctx = context.workingctx(self, (p1, p2), text, user, date, | |
841 | extra, changes) |
|
841 | extra, changes) | |
842 | if editor: |
|
842 | if editor: | |
843 |
|
|
843 | cctx._text = editor(self, cctx) | |
844 |
ret = self.commitctx( |
|
844 | ret = self.commitctx(cctx, True) | |
845 |
|
845 | |||
846 | # update dirstate and mergestate |
|
846 | # update dirstate and mergestate | |
847 | for f in changes[0] + changes[1]: |
|
847 | for f in changes[0] + changes[1]: |
General Comments 0
You need to be logged in to leave comments.
Login now