From: Junio C Hamano <junkio@cox.net>
Date: Mon, 22 May 2006 07:33:34 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~75
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b05b52027c0e43abc9629049944283729a07899f;p=git.git

Merge branch 'master' into next

* master:
  diff: minor option combination fix.
---

b05b52027c0e43abc9629049944283729a07899f