equal
deleted
inserted
replaced
5457 raise util.Abort(_("too many options specified")) |
5457 raise util.Abort(_("too many options specified")) |
5458 if pats and all: |
5458 if pats and all: |
5459 raise util.Abort(_("can't specify --all and patterns")) |
5459 raise util.Abort(_("can't specify --all and patterns")) |
5460 if not (all or pats or show or mark or unmark): |
5460 if not (all or pats or show or mark or unmark): |
5461 raise util.Abort(_('no files or directories specified'), |
5461 raise util.Abort(_('no files or directories specified'), |
5462 hint=('use --all to remerge all files')) |
5462 hint=('use --all to re-merge all unresolved files')) |
5463 |
5463 |
5464 if show: |
5464 if show: |
5465 fm = ui.formatter('resolve', opts) |
5465 fm = ui.formatter('resolve', opts) |
5466 ms = mergemod.mergestate(repo) |
5466 ms = mergemod.mergestate(repo) |
5467 m = scmutil.match(repo[None], pats, opts) |
5467 m = scmutil.match(repo[None], pats, opts) |