diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:53 -0700 |
| commit | db65170ee5558b47355e7f9f111aecb5b152d4d9 (patch) | |
| tree | 475abf30cf47918b0e2d01b01ace04d20c498898 /git-p4.py | |
| parent | 82b416e063d9b1497eac78a8deaad340d251f1dc (diff) | |
| parent | 8dbf3eb6850d6d9495ace908625fe50888b111e6 (diff) | |
| download | git-db65170ee5558b47355e7f9f111aecb5b152d4d9.tar.gz | |
Merge branch 'jk/color-diff-plain-is-context'
"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 'git-p4.py')
0 files changed, 0 insertions, 0 deletions