Mercurial > public > mercurial-scm > hg

diff mercurial/help/config.txt @ 25631:2748bf78a5bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: add fuzz config flag (issue4697)
author Matt Mackall <mpm@selenic.com>
date Thu, 18 Jun 2015 15:42:40 -0500
parents bde670e58ae0
children e90e031b3016
line wrap: on
line diff
--- a/mercurial/help/config.txt	Fri Jun 19 11:17:11 2015 -0700
+++ b/mercurial/help/config.txt	Thu Jun 18 15:42:40 2015 -0500
@@ -1093,6 +1093,11 @@
     of line, patch line endings are preserved.
     Default: strict.
 
+``fuzz``
+    The number of lines of 'fuzz' to allow when applying patches. This
+    controls how much context the patcher is allowed to ignore when
+    trying to apply a patch.
+    Default: 2
 
 ``paths``
 ---------