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

38856:a01200b25da6

``resolve.confirm``
    Confirm before re-merging all unresolved files when running
    :hg:`resolve --all`.
    (default: False)

``status.relative``
    Make paths in :hg:`status` output relative to the current directory.
    (default: False)

38857:96d0795bd0bd

``resolve.confirm``
    Confirm before re-merging all unresolved files when running
    :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)