summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-27 16:48:46 -0400
committerJunio C Hamano <gitster@pobox.com>2015-05-27 13:54:42 -0700
commit8dbf3eb6850d6d9495ace908625fe50888b111e6 (patch)
tree2771beb8838965fc405f82ffd74096912837215d /diff.h
parent74b15bfbf6f7efffa40fda170b3a3cb0218d8651 (diff)
downloadgit-8dbf3eb6850d6d9495ace908625fe50888b111e6.tar.gz
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
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,