Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 38873:7e75777e4a51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: correct behavior of mark-check=none to match docs Differential Revision: https://phab.mercurial-scm.org/D4121
author Kyle Lippincott <spectral@google.com>
date Sun, 05 Aug 2018 00:53:55 -0700
parents db03e5cefc82
children f35f6791595f
comparison
equal deleted inserted replaced
38872:576eef1ab43d 38873:7e75777e4a51
4606 4606
4607 tocomplete = [] 4607 tocomplete = []
4608 hasconflictmarkers = [] 4608 hasconflictmarkers = []
4609 if mark: 4609 if mark:
4610 markcheck = ui.config('commands', 'resolve.mark-check') 4610 markcheck = ui.config('commands', 'resolve.mark-check')
4611 if markcheck not in ['warn', 'abort']:
4612 # Treat all invalid / unrecognized values as 'none'.
4613 markcheck = False
4611 for f in ms: 4614 for f in ms:
4612 if not m(f): 4615 if not m(f):
4613 continue 4616 continue
4614 4617
4615 didwork = True 4618 didwork = True