On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > David Aguilar <davvid@xxxxxxxxx> writes: > >> I would advise against the file locking, though. You ain't gonna need >> it ;-) > > What do you suggest to merge Word files? If the files are in the DOCX format you can just expand them as zip archives and diff what's inside of them. The text in particular is stored as XML. -- -Drew Northup -------------------------------------------------------------- "As opposed to vegetable or mineral error?" -John Pescatore, SANS NewsBites Vol. 12 Num. 59 -- 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