Merge branch 'lt/diff'
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:09:15 +0000 (18:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:09:15 +0000 (18:09 -0700)
* lt/diff:
  git diff: support "-U" and "--unified" options properly

1  2 
diff.c

diff --cc diff.c
Simple merge