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

login
register
mail settings
Submitter phabricator
Date Aug. 6, 2018, 2:40 a.m.
Message ID <a994fd5b8edf668f066e9dce51427c8d@localhost.localdomain>
Download mbox | patch
Permalink /patch/33282/
State Not Applicable
Headers show

Comments

phabricator - Aug. 6, 2018, 2:40 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG755741c39230: resolve: update commands.resolve.confirm help text (authored by khanchi97, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D4103?vs=9906&id=9939#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4103?vs=9906&id=9939

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

AFFECTED FILES
  mercurial/help/config.txt

CHANGE DETAILS




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

Patch

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