Mercurial > hg-stable
changeset 38914:755741c39230
resolve: update commands.resolve.confirm help text
Included --mark and --unmark in the help text of
resolve.confirm.config.
Differential Revision: https://phab.mercurial-scm.org/D4103
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 04 Aug 2018 12:58:08 +0530 |
| parents | f35f6791595f |
| children | da3bd2afd68d |
| files | mercurial/help/config.txt |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sat Aug 04 12:43:41 2018 +0530 +++ b/mercurial/help/config.txt Sat Aug 04 12:58:08 2018 +0530 @@ -439,8 +439,7 @@ ------------ ``resolve.confirm`` - Confirm before re-merging all unresolved files when running - :hg:`resolve --all`. + Confirm before performing action if no filename is passed. (default: False) ``resolve.mark-check``