On Wed, 28 Jun 2006, Linus Torvalds wrote: > It would be lovely if libxdiff did a 3-way merge on its own, but this > basically approximates it within that three_way_filemerge() function > using external functionality. This is my todo-list, that unfortunately is pretty crowded nowadays. I'll come graveling you main window once I have it ;) - Davide - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Jun 30 04:21:36 2006
This archive was generated by hypermail 2.1.8 : 2006-06-30 04:22:01 EST