From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 01:52:22 +0000 (-0800)
Subject: Merge branch 'kc/maint-diff-bwi-fix' into maint
X-Git-Tag: v1.6.1.3~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c4c286c394cc383577bf884f37a708bba98549e;p=git.git

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
---

8c4c286c394cc383577bf884f37a708bba98549e