Merge branch 'kc/maint-diff-bwi-fix'

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

diff --combined t/t4015-diff-whitespace.sh
index dbb608cf79cf8f0ae7cc512f2007236ab953ff99,5ed18806a783c8004f733e5571cfb1fc8b4dd698..6d13da30dad5a78fb17a01e86ef33072ea9e6250
--- 1/t/t4015-diff-whitespace.sh
--- 2/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@@ -7,7 -7,7 +7,7 @@@ test_description='Test special whitespa
  
  '
  . ./test-lib.sh
 -. ../diff-lib.sh
 +. "$TEST_DIRECTORY"/diff-lib.sh
  
  # Ray Lehtiniemi's example
  
@@@ -99,11 -99,11 +99,11 @@@ EO
  git diff -w > out
  test_expect_success 'another test, with -w' 'test_cmp expect out'
  git diff -w -b > out
- test_expect_failure 'another test, with -w -b' 'test_cmp expect out'
+ test_expect_success 'another test, with -w -b' 'test_cmp expect out'
  git diff -w --ignore-space-at-eol > out
- test_expect_failure 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
+ test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
  git diff -w -b --ignore-space-at-eol > out
- test_expect_failure 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'
+ test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'
  
  tr 'Q' '\015' << EOF > expect
  diff --git a/x b/x
@@@ -123,7 -123,7 +123,7 @@@ EO
  git diff -b > out
  test_expect_success 'another test, with -b' 'test_cmp expect out'
  git diff -b --ignore-space-at-eol > out
- test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
+ test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
  
  tr 'Q' '\015' << EOF > expect
  diff --git a/x b/x