import: cross-reference patch.fuzz option from `hg help import`
authorJordi Gutiérrez Hermoso <jordigh@octave.org>
Tue, 23 Jun 2015 13:56:53 -0400
changeset 25651 125c11ec7bee
parent 25650 e43e7d58a65d
child 25652 2882d6886919
import: cross-reference patch.fuzz option from `hg help import`
mercurial/commands.py
--- a/mercurial/commands.py	Tue Jun 23 13:57:39 2015 -0400
+++ b/mercurial/commands.py	Tue Jun 23 13:56:53 2015 -0400
@@ -4174,9 +4174,10 @@
     importing only the patch metadata.
 
     It is possible to use external patch programs to perform the patch
-    by setting the ``ui.patch`` configuration option.
+    by setting the ``ui.patch`` configuration option. For the default
+    internal tool, the fuzz can also be configured via ``patch.fuzz``.
     See :hg:`help config` for more information about configuration
-    files and how to use this option.
+    files and how to use these options.
 
     To read a patch from standard input, use "-" as the patch name. If
     a URL is specified, the patch will be downloaded from it.
@@ -4208,6 +4209,10 @@
 
           hg import --config ui.patch="patch --merge" fuzzy.patch
 
+      - change the default fuzzing from 2 to a less strict 7
+
+          hg import --config ui.fuzz=7 fuzz.patch
+
     Returns 0 on success, 1 on partial success (see --partial).
     """