Colorize merge commit diffs as well

Signed-off-by: Sebastian Harl <sh@tokkee.org>

diff --git a/tig.c b/tig.c
index b0032ea67a9fd869b658fa3e984c38007a6250d6..2baf56cdc6c5bd30bc28da30c542020661b298a0 100644 (file)
--- 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), \