Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: update commands.resolve.confirm help text
authorSushil khanchi <sushilkhanchi97@gmail.com>
Sat, 04 Aug 2018 12:58:08 +0530
changeset 38875 755741c39230
parent 38874 f35f6791595f
child 38876 da3bd2afd68d
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
mercurial/help/config.txt file | annotate | diff | comparison | revisions 
--- 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``
mercurial