equal
deleted
inserted
replaced
5604 raise error.Abort( |
5604 raise error.Abort( |
5605 _('resolve command not applicable when not merging')) |
5605 _('resolve command not applicable when not merging')) |
5606 |
5606 |
5607 wctx = repo[None] |
5607 wctx = repo[None] |
5608 |
5608 |
|
5609 if ms.mergedriver and ms.mdstate() == 'u': |
|
5610 proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
5611 ms.commit() |
|
5612 # allow mark and unmark to go through |
|
5613 if not mark and not unmark and not proceed: |
|
5614 return 1 |
|
5615 |
5609 m = scmutil.match(wctx, pats, opts) |
5616 m = scmutil.match(wctx, pats, opts) |
5610 ret = 0 |
5617 ret = 0 |
5611 didwork = False |
5618 didwork = False |
5612 |
5619 |
5613 tocomplete = [] |
5620 tocomplete = [] |