Merge in xdiff cleanup pieces
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 21:43:57 +0000 (14:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 21:43:57 +0000 (14:43 -0700)

Trivial merge