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
--- 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``