From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 23:39:14 +0000 (-0700)
Subject: Merge branch 'lt/diff' into next
X-Git-Tag: v1.4.1-rc1~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c621197a20d42b6b9115d7031bdb49e24f961898;p=git.git

Merge branch 'lt/diff' into next

* lt/diff:
  git diff: support "-U" and "--unified" options properly
  include header to define uint32_t, necessary on Mac OS X
---

c621197a20d42b6b9115d7031bdb49e24f961898