Merge branch 'dt/disable-bitmap-in-auto-gc'

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 58f4bd6afa12240f9e416860ac12d82776815ee9..d8570f2a75096c07d7045ddfba7f1e2e6396d000 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -172,10 +172,8 @@ diff.tool::
 include::mergetools-diff.txt[]
 
 diff.indentHeuristic::
-diff.compactionHeuristic::
-       Set one of these options to `true` to enable one of two
-       experimental heuristics that shift diff hunk boundaries to
-       make patches easier to read.
+       Set this option to `true` to enable experimental heuristics
+       that shift diff hunk boundaries to make patches easier to read.
 
 diff.algorithm::
        Choose a diff algorithm.  The variants are as follows: