Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Aug 02 14:57:20 2018 -0700
+++ b/mercurial/commands.py	Sun Aug 05 00:53:55 2018 -0700
@@ -4608,6 +4608,9 @@
         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