summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-05 23:41:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-05 23:41:19 (GMT)
commit4a2caf691232ef9599ee3f1a1a04a47f309e65c1 (patch)
tree91d75bb9b5fa1147a170215badbff9a5da439382 /diff.c
parent8a61097cde387870921e822bdf90b4ffd3792845 (diff)
parent74bb2dfbec15ad47242b9a879b5547b6f4a28318 (diff)
downloadgit-4a2caf691232ef9599ee3f1a1a04a47f309e65c1.zip
git-4a2caf691232ef9599ee3f1a1a04a47f309e65c1.tar.gz
git-4a2caf691232ef9599ee3f1a1a04a47f309e65c1.tar.bz2
Merge branch 'al/ansi-color'
* al/ansi-color: builtin-branch.c: Rename branch category color names Clean up use of ANSI color sequences
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/diff.c b/diff.c
index ff3624e..3feca1b 100644
--- a/diff.c
+++ b/diff.c
@@ -30,14 +30,14 @@ int diff_auto_refresh_index = 1;
static int diff_mnemonic_prefix;
static char diff_colors[][COLOR_MAXLEN] = {
- "\033[m", /* reset */
- "", /* PLAIN (normal) */
- "\033[1m", /* METAINFO (bold) */
- "\033[36m", /* FRAGINFO (cyan) */
- "\033[31m", /* OLD (red) */
- "\033[32m", /* NEW (green) */
- "\033[33m", /* COMMIT (yellow) */
- "\033[41m", /* WHITESPACE (red background) */
+ GIT_COLOR_RESET,
+ GIT_COLOR_NORMAL, /* PLAIN */
+ GIT_COLOR_BOLD, /* METAINFO */
+ GIT_COLOR_CYAN, /* FRAGINFO */
+ GIT_COLOR_RED, /* OLD */
+ GIT_COLOR_GREEN, /* NEW */
+ GIT_COLOR_YELLOW, /* COMMIT */
+ GIT_COLOR_BG_RED, /* WHITESPACE */
};
static void diff_filespec_load_driver(struct diff_filespec *one);