On Sat, 25 Mar 2006, Junio C Hamano wrote: > > This is a replacement for my previous one, which reduces the > changes to the testsuite. Looks good. With this, I think it's certainly ready for the "next" branch, and with some testing should be quite mergable into the main branch too. I really didn't have to mess up the libxdiff files very much, so I don't think I introduced any new bugs, and libxdiff itself seems to be pretty stable (and that's partly from running the tests, but even more from just looking at the code and not having any 'Ewww! Gross!'-moments). Which is not to say that there couldn't be bugs, but I think this is very much worth merging quickly.. > I'll find time to omit prepare_temp_file() calls from diffcore > emit routines over the weekend. Another useful project would be > to redo the combine-diff.c using the real built-in diff. I think the pickaxe improvements would be an even bigger thing.. Linus - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html