From: thestar@fussycoder.id.au
Date: Thu, 12 Mar 2009 01:57:09 GMT
Subject: Re: Google Summer of Code 2009: GIT
Message-ID: <20090312125709.qnfnw7glc4ko8soo@webmail.fussycoder.id.au>
In-Reply-To: <7veix33f5e.fsf@gitster.siamese.dyndns.org>

<Entire conversation snipped>

Guys, I'm sure you're only using OpenOffice.org documents as an  
example to facilitate discussing merge helpers, but I feel the need to  
point out that one can already merge OpenOffice documents using  
OpenOffice to do so. (And I have done so in the past while reconciling  
differences between some spreadsheets).

However, the interface OpenOffice provides for that is awful and very  
confusing, but it is there. :)

The document merge provided by Microsoft Office 2003 is vastly  
superior imho, however it only provides 'change markers' - and doesn't  
help you do the actual merge - one must do a merge to get the change  
annotations, and then manually modify a new copy with those updates  
you feel are neccessary.
  - This is one feature that does not appear to be present in  
Microsoft Office 2007, by the way...