Mercurial > hg
diff mercurial/help/config.txt @ 38875: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 | 96d0795bd0bd |
children | cded904f7acc |
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``