Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 04:33:12 +0000 (20:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 04:33:12 +0000 (20:33 -0800)
* maint:
  test-lib.sh/test_decode_color(): use octal not hex in awk script

1  2 
t/test-lib.sh

diff --cc t/test-lib.sh
Simple merge