Merge branch 'kc/maint-diff-bwi-fix' into maint
commit8c4c286c394cc383577bf884f37a708bba98549e
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000 (5 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000 (5 17:52 -0800)
tree0cf968098bf4297baa233c7b409439ed0ff62c12
parentf26b5dc9efccc998510505685d6d919b4dd087e7
parent6d12acefd5ac0cd688bcc77470bb1d73859cdab1
Merge branch 'kc/maint-diff-bwi-fix' into maint

* kc/maint-diff-bwi-fix:
  Fix combined use of whitespace ignore options to diff
  test more combinations of ignore-whitespace options to diff
t/t4015-diff-whitespace.sh