Davide Libenzi <davidel@xxxxxxxxxxxxxxx> writes: > On Wed, 12 Apr 2006, Davide Libenzi wrote: > >> Yes, this is what GNU diff does. It's a post-process of the edit >> script. Not a problem at all. Till this weekend (included) I'm >> pretty booked, but I'll do that in the following days. > > Dang, that was a short weekend. I found a lunch-time hour for > this. Would you try to see if this libxdiff-based diff merges on your > tree? > See also how it looks for you. Very impressed, and pleased with the result. I've only taken a cursory look, but with a very limited number of tests, it looks much better. Thanks. For the sake of full disclosure, the reason I wanted consistency was not for the diff output I quoted earlier, but to help making the combined patch output cleaner. It does reduce false match from the infamous 12-way Octopus by Len Brown: git diff-tree --cc 9fdb62af92c741addbea15545f214a6e89460865 - : 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