equal
deleted
inserted
replaced
4920 raise util.Abort(_('no files or directories specified; ' |
4920 raise util.Abort(_('no files or directories specified; ' |
4921 'use --all to remerge all files')) |
4921 'use --all to remerge all files')) |
4922 |
4922 |
4923 ms = mergemod.mergestate(repo) |
4923 ms = mergemod.mergestate(repo) |
4924 |
4924 |
4925 if not ms.active(): |
4925 if not ms.active() and not show: |
4926 raise util.Abort(_('resolve command not applicable when not merging')) |
4926 raise util.Abort(_('resolve command not applicable when not merging')) |
4927 |
4927 |
4928 m = scmutil.match(repo[None], pats, opts) |
4928 m = scmutil.match(repo[None], pats, opts) |
4929 ret = 0 |
4929 ret = 0 |
4930 |
4930 |