On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup <n1xim.em...@gmail.com> wrote: > On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy > <matthieu....@grenoble-inp.fr> wrote: >> David Aguilar <dav...@gmail.com> 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.
An XML diff means nothing to a regular user, and manually "merging" this way can produce unreadable Words files. So no, it's still not an answer. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
