summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-12-09 16:01:26 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-09 14:51:31 -0800
commit71b59849753589c3faa04176e875071417ceddd5 (patch)
tree3b437f0a87008e2c63a70757e6e87d838068a6ca /t/t3402-rebase-merge.sh
parentdiff-highlight: allow configurable colors (diff)
downloadtgif-71b59849753589c3faa04176e875071417ceddd5.tar.xz
parse_color: drop COLOR_BACKGROUND macro
Commit 695d95d (parse_color: refactor color storage, 2014-11-20) introduced two macros, COLOR_FOREGROUND and COLOR_BACKGROUND. The latter conflicts with a system macro defined on Windows, breaking compilation there. The simplest solution is to just get rid of these macros entirely. They are constants that are only used in one place (since the whole point of 695d95d was to avoid repeating ourselves). Their main function is to make the magic character constants more readable, but we can do the same thing with a comment. Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3402-rebase-merge.sh')
0 files changed, 0 insertions, 0 deletions