equal
deleted
inserted
replaced
4544 if pats and all: |
4544 if pats and all: |
4545 raise error.Abort(_("can't specify --all and patterns")) |
4545 raise error.Abort(_("can't specify --all and patterns")) |
4546 if not (all or pats or show or mark or unmark): |
4546 if not (all or pats or show or mark or unmark): |
4547 raise error.Abort(_('no files or directories specified'), |
4547 raise error.Abort(_('no files or directories specified'), |
4548 hint=('use --all to re-merge all unresolved files')) |
4548 hint=('use --all to re-merge all unresolved files')) |
|
4549 if mark and confirm and not pats: |
|
4550 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' |
|
4551 b'$$ &Yes $$ &No')): |
|
4552 raise error.Abort(_('user quit')) |
4549 |
4553 |
4550 if show: |
4554 if show: |
4551 ui.pager('resolve') |
4555 ui.pager('resolve') |
4552 fm = ui.formatter('resolve', opts) |
4556 fm = ui.formatter('resolve', opts) |
4553 ms = mergemod.mergestate.read(repo) |
4557 ms = mergemod.mergestate.read(repo) |