diff options
author | Jeff King <peff@peff.net> | 2015-05-27 22:48:46 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-27 22:54:42 +0200 |
commit | 8dbf3eb6850d6d9495ace908625fe50888b111e6 (patch) | |
tree | 2771beb8838965fc405f82ffd74096912837215d /diff.h | |
parent | diff: accept color.diff.context as a synonym for "plain" (diff) | |
download | git-8dbf3eb6850d6d9495ace908625fe50888b111e6.tar.xz git-8dbf3eb6850d6d9495ace908625fe50888b111e6.zip |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, |