Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/config.txt @ 38896: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 755741c39230
line wrap: on
line diff
--- a/mercurial/help/config.txt	Mon Apr 16 23:49:38 2018 -0700
+++ b/mercurial/help/config.txt	Fri Aug 03 12:57:44 2018 -0700
@@ -443,6 +443,16 @@
     :hg:`resolve --all`.
     (default: False)
 
+``resolve.mark-check``
+    Determines what level of checking :hg:`resolve --mark` will perform before
+    marking files as resolved. Valid values are ``none`, ``warn``, and
+    ``abort``. ``warn`` will output a warning listing the file(s) that still
+    have conflict markers in them, but will still mark everything resolved.
+    ``abort`` will output the same warning but will not mark things as resolved.
+    If --all is passed and this is set to ``abort``, only a warning will be
+    shown (an error will not be raised).
+    (default: ``none``)
+
 ``status.relative``
     Make paths in :hg:`status` output relative to the current directory.
     (default: False)