D4103: resolve: update commands.resolve.confirm help text

khanchi97 (Sushil khanchi) phabricator at mercurial-scm.org
Sat Aug 4 07:32:09 UTC 2018


khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4103

AFFECTED FILES
  mercurial/help/config.txt

CHANGE DETAILS

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -439,8 +439,10 @@
 ------------
 
 ``resolve.confirm``
-    Confirm before re-merging all unresolved files when running
-    :hg:`resolve --all`.
+    Confirm before performing actions.
+    :hg: `resolve -m` - confirm before marking all unresolved files as resolved.
+    :hg: `resolve -u` - confirm before marking all resolved files as unresolved.
+    :hg:`resolve --all` - confirm to re-merge all unresolved files.
     (default: False)
 
 ``status.relative``



To: khanchi97, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list