Merge branch 'lt/diff' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:39:14 +0000 (16:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:39:14 +0000 (16:39 -0700)
* lt/diff:
  git diff: support "-U" and "--unified" options properly
  include header to define uint32_t, necessary on Mac OS X


Trivial merge