Mercurial > hg

diff mercurial/commands.py @ 38857:96d0795bd0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: graduate resolve.mark-check from experimental, add docs Since this hasn't been in a release yet, I'm not bothering to add an alias for the experimental name of the config variable. Differential Revision: https://phab.mercurial-scm.org/D4071
author Kyle Lippincott <spectral@google.com>
date Fri, 03 Aug 2018 12:57:44 -0700
parents f8732e33bcbc
children db03e5cefc82
line wrap: on
line diff
--- 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