mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT

Browse Source 
The latter is a much more descriptive name (and we support
"color.diff.context" now). This also updates the name of any
local variables which were used to store the color.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2015-05-27 16:48:46 -04:00
committed by Junio C Hamano
parent 74b15bfbf6
commit 8dbf3eb685
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.h
View File

@ -175,7 +175,7 @@ struct diff_options {
enum color_diff {
DIFF_RESET = 0,
DIFF_PLAIN = 1,
DIFF_CONTEXT = 1,
DIFF_METAINFO = 2,
DIFF_FRAGINFO = 3,
DIFF_FILE_OLD = 4,