From: Drew Northup <n1xim.email@gmail.com>
Date: Sun, 21 Oct 2012 12:20:13 GMT
Subject: Re: In search of a version control system
Message-ID: <CAM9Z-nnQjhehJEpyhyTY=rsK_f=2gTOUMVTycn7-Lao8Gog0pA@mail.gmail.com>
In-Reply-To: <vpq4nm4rxsy.fsf@grenoble-inp.fr>

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.

-- 
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59