Code

Merge branch 'kb/maint-diff-ws-check' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700)
commit861b5ac0ec54abcf588cf802c9ce1e70b42859b8
tree6a065f5d76abef0c0e4e38db29ef15bd846b3e1b
parent0ead869fcba8214e0863cccfe85c3f87d6f26f1c
parentcfd1a9849cdb4b9c7fcd0cb71a28cbdbc3494329
Merge branch 'kb/maint-diff-ws-check' into next

* 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