From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: Google Summer of Code 2009: GIT
Date: Thu, 12 Mar 2009 00:40:05 -0700
Message-ID: <7vy6vbi3ze.fsf@gitster.siamese.dyndns.org>
References: <49B74373.3090609@gmail.com>
 <alpine.DEB.1.00.0903111255470.10279@pacific.mpi-cbg.de>
 <ab9fa62a0903110511u63e7d46dr3bb783ee891ca4ae@mail.gmail.com>
 <alpine.DEB.1.00.0903111353340.10498@intel-tinevez-2-302>
 <ab9fa62a0903110655y4a47ccfkde0984ecb46b3307@mail.gmail.com>
 <alpine.DEB.1.00.0903111458340.10498@intel-tinevez-2-302>
 <alpine.DEB.1.10.0903110931070.13653@asgard.lang.hm>
 <ab9fa62a0903111007w4772b234x8e6fd19cdc7fc595@mail.gmail.com>
 <alpine.DEB.1.10.0903111223470.16753@asgard.lang.hm>
 <ab9fa62a0903111302j46c46c2q96af497fa2ac513e@mail.gmail.com>
 <alpine.DEB.1.10.0903111307050.16753@asgard.lang.hm>
 <alpine.DEB.1.00.0903112136560.10279@pacific.mpi-cbg.de>
 <alpine.DEB.1.10.0903111401520.16753@asgard.lang.hm>
 <7veix33f5e.fsf@gitster.siamese.dyndns.org>
 <20090312125709.qnfnw7glc4ko8soo@webmail.fussycoder.id.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: david@lang.hm, Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	saurabh gupta <saurabhgupta1403@gmail.com>, git@vger.kernel.org
To: thestar@fussycoder.id.au
X-From: git-owner@vger.kernel.org Thu Mar 12 08:42:10 2009
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1LhfYO-000490-Co
	for gcvg-git-2@gmane.org; Thu, 12 Mar 2009 08:42:08 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751785AbZCLHkT (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Thu, 12 Mar 2009 03:40:19 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751565AbZCLHkS
	(ORCPT <rfc822;git-outgoing>); Thu, 12 Mar 2009 03:40:18 -0400
Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:42712 "EHLO
	sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751047AbZCLHkQ (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 12 Mar 2009 03:40:16 -0400
Received: from localhost.localdomain (unknown [127.0.0.1])
	by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id A7DDEA1EDE;
	Thu, 12 Mar 2009 03:40:14 -0400 (EDT)
Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher
 DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by
 a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 2B13DA1ED9; Thu,
 12 Mar 2009 03:40:06 -0400 (EDT)
In-Reply-To: <20090312125709.qnfnw7glc4ko8soo@webmail.fussycoder.id.au>
 (thestar@fussycoder.id.au's message of "Thu, 12 Mar 2009 12:57:09 +1100")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
X-Pobox-Relay-ID: 06664BB2-0ED9-11DE-A2C1-CFA5EBB1AA3C-77302942!a-sasl-fastnet.pobox.com
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/113010>

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