Merge branch 'kb/maint-diff-ws-check' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:27 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:27 +0000 (12:47 -0800)
commit4713fd9b5d472f94fc6f821ae8581d27da4e8094
treee26fcc988f6d9bf9aa19e988e134a4adc67d6c28
parenta33fb40fe477fa1a9ce882230415f19378959390
parentcfd1a9849cdb4b9c7fcd0cb71a28cbdbc3494329
Merge branch 'kb/maint-diff-ws-check' into maint

* kb/maint-diff-ws-check:
  diff: handle lines containing only whitespace and tabs better
  test-lib: extend test_decode_color to handle more color codes
t/test-lib.sh