Merge branch 'dt/mailinfo'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 7805a0ccadf27e4fea46dcd95796c570e893e6b3..2d77a196269b2d50de9c661fa8869badf155730a 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,12 +63,7 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
---compaction-heuristic::
---no-compaction-heuristic::
-       These are to help debugging and tuning an experimental
-       heuristic (which is off by default) that shifts the hunk
-       boundary in an attempt to make the resulting patch easier
-       to read.
+include::diff-heuristic-options.txt[]
 
 --minimal::
        Spend extra time to make sure the smallest possible