From 8dbf3eb6850d6d9495ace908625fe50888b111e6 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 27 May 2015 16:48:46 -0400 Subject: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT 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 Signed-off-by: Junio C Hamano --- diff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index b4a624d235..1ac0582228 100644 --- a/diff.h +++ b/diff.h @@ -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, -- cgit v1.2.1