Hi, On Tue, 5 Dec 2006, Ramsay Jones wrote: > Have you had time to look at my test cases? Not really. Besides, I did _not_ implement a full diff3, but _just_ the merge. I.e. my function does not output anything, but (in theory) fills a buffer with what merge would have written into the first file. However, once I understand how your tests work, I'll try to concoct a test script for git-with-xdl_merge. Ciao, Dscho - To unsubscribe from this list: 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