Merge branch 'kc/maint-diff-bwi-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2009 05:17:47 +0000 (21:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2009 05:17:47 +0000 (21:17 -0800)
* kc/maint-diff-bwi-fix:
  test more combinations of ignore-whitespace options to diff


Trivial merge