comparison mercurial/help/config.txt @ 38857:96d0795bd0bd

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
comparison
equal deleted inserted replaced
38856:a01200b25da6 38857:96d0795bd0bd
440 440
441 ``resolve.confirm`` 441 ``resolve.confirm``
442 Confirm before re-merging all unresolved files when running 442 Confirm before re-merging all unresolved files when running
443 :hg:`resolve --all`. 443 :hg:`resolve --all`.
444 (default: False) 444 (default: False)
445
446 ``resolve.mark-check``
447 Determines what level of checking :hg:`resolve --mark` will perform before
448 marking files as resolved. Valid values are ``none`, ``warn``, and
449 ``abort``. ``warn`` will output a warning listing the file(s) that still
450 have conflict markers in them, but will still mark everything resolved.
451 ``abort`` will output the same warning but will not mark things as resolved.
452 If --all is passed and this is set to ``abort``, only a warning will be
453 shown (an error will not be raised).
454 (default: ``none``)
445 455
446 ``status.relative`` 456 ``status.relative``
447 Make paths in :hg:`status` output relative to the current directory. 457 Make paths in :hg:`status` output relative to the current directory.
448 (default: False) 458 (default: False)
449 459