Merge branch 'kb/maint-diff-ws-check'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:47 +0000 (15:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 23:01:47 +0000 (15:01 -0800)
commit44e4155f8356a33e04a23b37a111bb4af0a8b060
tree73afd89c86acefa95587e3f1cd6e0ad40d0b284e
parent016c4b8919a0a58a430f3483aeac35de9dfdc579
parentcfd1a9849cdb4b9c7fcd0cb71a28cbdbc3494329
Merge branch 'kb/maint-diff-ws-check'

* 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