Merge branch 'lt/diffgen' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 08:15:44 +0000 (00:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 08:15:44 +0000 (00:15 -0800)
* lt/diffgen:
  true built-in diff: run everything in-core.

1  2 
diff.c

diff --cc diff.c
Simple merge