From: Junio C Hamano <junkio@cox.net>
Date: Tue, 4 Apr 2006 21:43:57 +0000 (-0700)
Subject: Merge in xdiff cleanup pieces
X-Git-Tag: v1.3.0-rc2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d9c54d7b39faab35f0b30459fe4e2c7f32124b8;p=git.git

Merge in xdiff cleanup pieces
---

3d9c54d7b39faab35f0b30459fe4e2c7f32124b8