From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Jan 2009 05:17:47 +0000 (-0800)
Subject: Merge branch 'kc/maint-diff-bwi-fix'
X-Git-Tag: v1.6.2-rc0~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6bc8c2309d7667ba5a43cb6417b5b60a358754d;p=git.git

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

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

b6bc8c2309d7667ba5a43cb6417b5b60a358754d