diff options
Diffstat (limited to 'Documentation/config/diff.txt')
| -rw-r--r-- | Documentation/config/diff.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 45f3fe855c..1135a62a0a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -218,8 +218,6 @@ endif::git-diff[] Set this option to `true` to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details. -include::../mergetools-diff.txt[] - `diff.indentHeuristic`:: Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read. |