Merge jc/diff leftover bits.
commitce2a34188b70c2d04ffdc1d9d3acc04d7a35c5c6
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 23:49:26 +0000 (4 15:49 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 23:49:26 +0000 (4 15:49 -0800)
tree6f91380db196dcf084aaaf953bc72e3d089a51ba
parentba23bbc8efff19f7ba4c272b6a06a4327a4cf039
parent1706306a54cfb5f1bf65f2b054aab2a5a7dba8e7
Merge jc/diff leftover bits.