# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1533367688 -19800
# Node ID 755741c39230ba0d1db42b8e8d6355ce60a02346
# Parent  f35f6791595f00e039963b05570f61214fce67ef
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

diff -r f35f6791595f -r 755741c39230 mercurial/help/config.txt
--- 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``