From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jan 2009 01:07:51 +0000 (-0800)
Subject: Merge branch 'kc/maint-diff-bwi-fix'
X-Git-Tag: v1.6.2-rc0~102
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9a01387b9714452ebcae431705a288e1a7e099c3;p=git.git

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

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

9a01387b9714452ebcae431705a288e1a7e099c3