comparison mercurial/commands.py @ 38857:96d0795bd0bd

resolve: graduate resolve.mark-check from experimental, add docs

Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.

Differential Revision: https://phab.mercurial-scm.org/D4071

38856:a01200b25da6

        runconclude = False

        tocomplete = []
        hasconflictmarkers = []
        if mark:
            markcheck = ui.config('experimental', 'resolve.mark-check')
        for f in ms:
            if not m(f):
                continue

            didwork = True

38857:96d0795bd0bd

        runconclude = False

        tocomplete = []
        hasconflictmarkers = []
        if mark:
            markcheck = ui.config('commands', 'resolve.mark-check')
        for f in ms:
            if not m(f):
                continue

            didwork = True