Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 02:06:06 +0000 (19:06 -0700)
* jc/diff:
  builtin-diff: fix comparison between two blobs.

1  2 
builtin-diff.c

diff --cc builtin-diff.c
Simple merge