This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4103

resolve: update commands.resolve.confirm help text
ClosedPublic

Authored by khanchi97 on Aug 4 2018, 3:32 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG755741c39230: resolve: update commands.resolve.confirm help text
Summary

Included --mark and --unmark in the help text of
resolve.confirm.config.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Aug 4 2018, 3:32 AM
pulkit added a subscriber: pulkit.Aug 4 2018, 1:13 PM
pulkit added inline comments.
mercurial/help/config.txt
442

How about if we just say, 'confirm before performing action if no filename is passed.'?

khanchi97 updated this revision to Diff 9906.Aug 4 2018, 2:19 PM
pulkit accepted this revision.Aug 5 2018, 10:22 PM

Updated the commit message in flight to follow the updated version of patch.

Closed by commit rHG755741c39230: resolve: update commands.resolve.confirm help text (authored by khanchi97). · Explain WhyAug 5 2018, 10:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/help/config.txt (3 lines)

Diff 9939

mercurial/help/config.txt

On some systems (such as MSYS in Windows), the terminal may support On some systems (such as MSYS in Windows), the terminal may support
a different color mode than the pager program. a different color mode than the pager program.
``commands`` ``commands``
------------ ------------
``resolve.confirm`` ``resolve.confirm``
Confirm before re-merging all unresolved files when running Confirm before performing action if no filename is passed.
pulkitUnsubmitted
Not Done

How about if we just say, 'confirm before performing action if no filename is passed.'?

pulkit: How about if we just say, 'confirm before performing action if no filename is passed.'?
:hg:`resolve --all`.
(default: False) (default: False)
``resolve.mark-check`` ``resolve.mark-check``
Determines what level of checking :hg:`resolve --mark` will perform before Determines what level of checking :hg:`resolve --mark` will perform before
marking files as resolved. Valid values are ``none`, ``warn``, and marking files as resolved. Valid values are ``none`, ``warn``, and
``abort``. ``warn`` will output a warning listing the file(s) that still ``abort``. ``warn`` will output a warning listing the file(s) that still
have conflict markers in them, but will still mark everything resolved. have conflict markers in them, but will still mark everything resolved.
``abort`` will output the same warning but will not mark things as resolved. ``abort`` will output the same warning but will not mark things as resolved.