From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Jun 2006 21:28:42 +0000 (-0700)
Subject: Merge branch 'js/diff'
X-Git-Tag: v1.4.1-rc2~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2cc06a0500b4b69e8563f76c42306e36b1f0aabf;p=git.git

Merge branch 'js/diff'

* js/diff:
  Teach diff about -b and -w flags
---

2cc06a0500b4b69e8563f76c42306e36b1f0aabf