Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 38857 96d0795bd0bd
parent 38822 f8732e33bcbc
child 38859 db03e5cefc82 
--- a/mercurial/commands.py	Mon Apr 16 23:49:38 2018 -0700
+++ b/mercurial/commands.py	Fri Aug 03 12:57:44 2018 -0700
@@ -4603,7 +4603,7 @@
         tocomplete = []
         hasconflictmarkers = []
         if mark:
-            markcheck = ui.config('experimental', 'resolve.mark-check')
+            markcheck = ui.config('commands', 'resolve.mark-check')
         for f in ms:
             if not m(f):
                 continue
Mercurial