tree ec0cbd5f1ad1bbd2eb4d5c8367d1b38e775d7480
parent 20fc9bc5e4fdd4b1f7fd98fbd2e91879f945d7e1
parent ca557afff9f7dad7a8739cd193ac0730d872e282
author Junio C Hamano <junkio@cox.net> 1144187037 -0700
committer Junio C Hamano <junkio@cox.net> 1144187037 -0700

Merge in xdiff cleanup pieces