equal
deleted
inserted
replaced
850 for f in changes[0]: |
850 for f in changes[0]: |
851 if f in ms and ms[f] == 'u': |
851 if f in ms and ms[f] == 'u': |
852 raise util.Abort(_("unresolved merge conflicts " |
852 raise util.Abort(_("unresolved merge conflicts " |
853 "(see hg resolve)")) |
853 "(see hg resolve)")) |
854 |
854 |
855 cctx = context.workingctx(self, (p1, p2), text, user, date, |
855 cctx = context.workingctx(self, text, user, date, extra, changes) |
856 extra, changes) |
|
857 if editor: |
856 if editor: |
858 cctx._text = editor(self, cctx, subs) |
857 cctx._text = editor(self, cctx, subs) |
859 edited = (text != cctx._text) |
858 edited = (text != cctx._text) |
860 |
859 |
861 # commit subs |
860 # commit subs |