Merge part of 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
1  2 
Makefile
diffcore.h

diff --cc Makefile
Simple merge
diff --cc diffcore.h
Simple merge