From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Sun, 21 Oct 2012 13:16:50 GMT
Subject: Re: In search of a version control system
Message-ID: <CACsJy8ASoaH40ScHwv1EB2kw8sxMh3oFb45s5shUPUmRUF7gRA@mail.gmail.com>
In-Reply-To: <CAM9Z-nnQjhehJEpyhyTY=rsK_f=2gTOUMVTycn7-Lao8Gog0pA@mail.gmail.com>

On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup <n1xim.email@gmail.com> wrote:
> On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy
> <Matthieu.Moy@grenoble-inp.fr> wrote:
>> David Aguilar <davvid@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