diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:11 -0700 |
| commit | 6998d890c7120fe2d30fa0b6f80ddfaad716f632 (patch) | |
| tree | 8a17d03e86dfb10d072225c303a576fe32d8d4cd /Documentation/user-manual.txt | |
| parent | Merge branch 'jk/diagnose-config-mmap-failure' into maint (diff) | |
| parent | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT (diff) | |
| download | tgif-6998d890c7120fe2d30fa0b6f80ddfaad716f632.tar.xz | |
Merge branch 'jk/color-diff-plain-is-context' into maint
"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.
* jk/color-diff-plain-is-context:
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
diff: accept color.diff.context as a synonym for "plain"
Diffstat (limited to 'Documentation/user-manual.txt')
0 files changed, 0 insertions, 0 deletions