Code

Merge branch 'kc/maint-diff-bwi-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 01:52:22 +0000 (17:52 -0800)
* kc/maint-diff-bwi-fix:
  Fix combined use of whitespace ignore options to diff
  test more combinations of ignore-whitespace options to diff

1  2 
t/t4015-diff-whitespace.sh

Simple merge