Merge branch 'lt/diff'
commit05f743f328e56780fb86c57da65f41df6e3b19a3
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:09:15 +0000 (15 18:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:09:15 +0000 (15 18:09 -0700)
tree81c3fc843da2a1d500ba781f473ecc9eb6684a9b
parentd55aaefa3e3920bdf9a52d80da2a244f72742228
parentee1e5412a702674d4da95a4aef73a73d2834dcc3
Merge branch 'lt/diff'

* lt/diff:
  git diff: support "-U" and "--unified" options properly
diff.c