From: Matthieu Moy Date: Tue, 09 Oct 2012 05:58:53 GMT Subject: Re: In search of a version control system Message-ID: In-Reply-To: David Aguilar writes: > I would advise against the file locking, though. You ain't gonna need > it ;-) What do you suggest to merge Word files? -- Matthieu Moy http://www-verimag.imag.fr/~moy/