equal
deleted
inserted
replaced
1365 raise util.Abort(_("cannot commit merge with missing files")) |
1365 raise util.Abort(_("cannot commit merge with missing files")) |
1366 |
1366 |
1367 ms = mergemod.mergestate(self) |
1367 ms = mergemod.mergestate(self) |
1368 for f in status.modified: |
1368 for f in status.modified: |
1369 if f in ms and ms[f] == 'u': |
1369 if f in ms and ms[f] == 'u': |
1370 raise util.Abort(_("unresolved merge conflicts " |
1370 raise util.Abort(_('unresolved merge conflicts ' |
1371 "(see hg help resolve)")) |
1371 '(see "hg help resolve")')) |
1372 |
1372 |
1373 if editor: |
1373 if editor: |
1374 cctx._text = editor(self, cctx, subs) |
1374 cctx._text = editor(self, cctx, subs) |
1375 edited = (text != cctx._text) |
1375 edited = (text != cctx._text) |
1376 |
1376 |