Merge part of 'jc/diff'
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)
commit379156e1dc46e0d22f0c7c0c52913c6259c62258
treeabb80fb56139b32facfbc282dc77dc8a7492f3e9
parent5343cf1082c93e41515acbc36a4a9c8c5995d4ac
parent65416758cd83772f2f3c69f1bd1f501608e64745
Merge part of 'jc/diff'