mercurial/commands.py

21263:f3e37409ecd3

    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified; '
                           'use --all to remerge all files'))

    ms = mergemod.mergestate(repo)
    m = scmutil.match(repo[None], pats, opts)
    ret = 0

    for f in ms:
        if not m(f):

21264:4e932dc5c113

    if not (all or pats or show or mark or unmark):
        raise util.Abort(_('no files or directories specified; '
                           'use --all to remerge all files'))

    ms = mergemod.mergestate(repo)

    if not ms.active():
        raise util.Abort(_('resolve command not applicable when not merging'))

    m = scmutil.match(repo[None], pats, opts)
    ret = 0

    for f in ms:
        if not m(f):