Code

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)
commitc621197a20d42b6b9115d7031bdb49e24f961898
tree2cab7ba24afa0566325578946c8d338e09d42c10
parentea892b27b15fbc46a3bb3ad2ddce737dc6590ae5
parentee1e5412a702674d4da95a4aef73a73d2834dcc3
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