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)
commitb6bc8c2309d7667ba5a43cb6417b5b60a358754d
tree00a422918457d1bd3b5d1c1b4d82494e8bfeb25e
parentb044c65855c79f627b002d77b5ed469bf3f0df0e
parent537a071f41259c8631284bef28497280cd33db95
Merge branch 'kc/maint-diff-bwi-fix'

* kc/maint-diff-bwi-fix:
  test more combinations of ignore-whitespace options to diff