From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Mon, 03 Oct 2005 19:48:37 GMT
Subject: Re: What to expect after 0.99.8
Message-ID: <200510032048.37363.alan@chandlerfamily.org.uk>
In-Reply-To: <7v7jcvxxrl.fsf@assigned-by-dhcp.cox.net>

On Monday 03 Oct 2005 01:14, Junio C Hamano wrote:
...
>
> Technical (heavier)
> -------------------
...
> * Look at libified GNU diff CVS seems to use, or libxdiff.
>

I did wonder today in response to a discussion at work about version control 
of documentation, whether git could in some way understand OpenDocument 
format and allow some form of merging of concurrent changes to the same 
document.  I am not sure if just unzipping the files and applying standard 
merge strategies the resultant xml would be good enough.

Sadly just a thought at the moment.


-- 
Alan Chandler
http://www.chandlerfamily.org.uk