From: Junio C Hamano Date: Tue, 20 Jan 2015 23:57:22 +0000 (-0800) Subject: Merge branch 'jk/colors' X-Git-Tag: v2.3.0-rc1~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d06ce4a508386230e9412e68264a744392795dcb;p=thirdparty%2Fgit.git Merge branch 'jk/colors' * jk/colors: parse_color: fix return value for numeric color values 0-8 --- d06ce4a508386230e9412e68264a744392795dcb