Merge branch 'kc/maint-diff-bwi-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 01:07:51 +0000 (17:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 01:07:51 +0000 (17:07 -0800)
commit9a01387b9714452ebcae431705a288e1a7e099c3
treecd740cca16bcf94af4221fc43111e872e6ae3622
parent36dd9393938d4e7f8843c6c587c9b4db077377fc
parent6d12acefd5ac0cd688bcc77470bb1d73859cdab1
Merge branch 'kc/maint-diff-bwi-fix'

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