thestar@xxxxxxxxxxxxxxxx writes: > <Entire conversation snipped> Which is not appreciated at all. > Guys, I'm sure you're only using OpenOffice.org documents as an > example to facilitate discussing merge helpers, but I feel the need to > point out that one can already merge OpenOffice documents using > OpenOffice to do so. (And I have done so in the past while reconciling > differences between some spreadsheets). It sounds like OOo itself can be counted as a "domain specific merge helper" in the second sense of the word---it wouldn't work as a merge driver but the end user can use it to merge the forked documents. Which is good to know ;-) -- 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