summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-07 15:15:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-07 15:15:59 -0800
commit00704e4ba527c7e6a36db9b37d59c719310d878c (patch)
tree3d213f563ed1d399ed7991b9fe95619cb421f196 /Documentation
parentMerge branch 'maint' (diff)
downloadtgif-00704e4ba527c7e6a36db9b37d59c719310d878c.tar.xz
Documentation/diff-config: work around AsciiDoc misfortune
The line that happens to begin with indent followed by "3. " was interpreted as if it was an enumerated list; just wrap the lines differently to work it around for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 89dd634674..4314ad0fbb 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -57,8 +57,8 @@ diff.statGraphWidth::
to all commands generating --stat output except format-patch.
diff.context::
- Generate diffs with <n> lines of context instead of the default of
- 3. This value is overridden by the -U option.
+ Generate diffs with <n> lines of context instead of the default
+ of 3. This value is overridden by the -U option.
diff.external::
If this config variable is set, diff generation is not