From: Sebastian Harl Date: Fri, 26 Feb 2010 22:23:13 +0000 (+0100) Subject: Colorize merge commit diffs as well X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2654e60d1ad213e9c8c1153593b7708233251a02;p=tig.git Colorize merge commit diffs as well Signed-off-by: Sebastian Harl --- diff --git a/tig.c b/tig.c index b0032ea..2baf56c 100644 --- a/tig.c +++ b/tig.c @@ -391,7 +391,9 @@ static const char **opt_blame_argv = NULL; LINE(DIFF_HEADER, "diff --git ", COLOR_YELLOW, COLOR_DEFAULT, 0), \ LINE(DIFF_CHUNK, "@@", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(DIFF_ADD, "+", COLOR_GREEN, COLOR_DEFAULT, 0), \ +LINE(DIFF_ADD2, " +", COLOR_GREEN, COLOR_DEFAULT, 0), \ LINE(DIFF_DEL, "-", COLOR_RED, COLOR_DEFAULT, 0), \ +LINE(DIFF_DEL2, " -", COLOR_RED, COLOR_DEFAULT, 0), \ LINE(DIFF_INDEX, "index ", COLOR_BLUE, COLOR_DEFAULT, 0), \ LINE(DIFF_OLDMODE, "old file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \ LINE(DIFF_NEWMODE, "new file mode ", COLOR_YELLOW, COLOR_DEFAULT, 0), \