From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Mar 2009 07:40:05 GMT
Subject: Re: Google Summer of Code 2009: GIT
Message-ID: <7vy6vbi3ze.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090312125709.qnfnw7glc4ko8soo@webmail.fussycoder.id.au>

thestar@fussycoder.id.au writes:

> <Entire conversation snipped>

Which is not appreciated at all.

> 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).

It sounds like OOo itself can be counted as a "domain specific merge
helper" in the second sense of the word---it wouldn't work as a merge
driver but the end user can use it to merge the forked documents.

Which is good to know ;-)