Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 38912: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 96d0795bd0bd
children cded904f7acc
line wrap: on
line diff
--- a/mercurial/configitems.py	Thu Aug 02 14:57:20 2018 -0700
+++ b/mercurial/configitems.py	Sun Aug 05 00:53:55 2018 -0700
@@ -194,7 +194,7 @@
     default=False,
 )
 coreconfigitem('commands', 'resolve.mark-check',
-    default=None,
+    default='none',
 )
 coreconfigitem('commands', 'show.aliasprefix',
     default=list,