Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
25630:c88082baf693 25631:2748bf78a5bf
1091 endings in patched files are normalized to their original setting 1091 endings in patched files are normalized to their original setting
1092 on a per-file basis. If target file does not exist or has no end 1092 on a per-file basis. If target file does not exist or has no end
1093 of line, patch line endings are preserved. 1093 of line, patch line endings are preserved.
1094 Default: strict. 1094 Default: strict.
1095 1095
1096 ``fuzz``
1097 The number of lines of 'fuzz' to allow when applying patches. This
1098 controls how much context the patcher is allowed to ignore when
1099 trying to apply a patch.
1100 Default: 2
1096 1101
1097 ``paths`` 1102 ``paths``
1098 --------- 1103 ---------
1099 1104
1100 Assigns symbolic names to repositories. The left side is the 1105 Assigns symbolic names to repositories. The left side is the