diff -r a01200b25da6 -r 96d0795bd0bd mercurial/commands.py
--- 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