mercurial/commands.py

38911:576eef1ab43d

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

            didwork = True

38912:7e75777e4a51

        tocomplete = []
        hasconflictmarkers = []
        if mark:
            markcheck = ui.config('commands', 'resolve.mark-check')
            if markcheck not in ['warn', 'abort']:
                # Treat all invalid / unrecognized values as 'none'.
                markcheck = False
        for f in ms:
            if not m(f):
                continue

            didwork = True