Merge branch 'mk/color'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:56 +0000 (16:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:56 +0000 (16:13 -0800)
* mk/color:
  Add color.ui variable which globally enables colorization if set

1  2 
builtin-log.c

diff --cc builtin-log.c
Simple merge