From mboxrd@z Thu Jan  1 00:00:00 1970
From: thestar@fussycoder.id.au
Subject: Re: Google Summer of Code 2009: GIT
Date: Thu, 12 Mar 2009 12:57:09 +1100
Message-ID: <20090312125709.qnfnw7glc4ko8soo@webmail.fussycoder.id.au>
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>
Mime-Version: 1.0
Content-Type: text/plain;
	charset=ISO-8859-1;
	DelSp="Yes";
	format="flowed"
Content-Transfer-Encoding: 7bit
Cc: david@lang.hm, Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	saurabh gupta <saurabhgupta1403@gmail.com>, git@vger.kernel.org
To: Junio C Hamano <gitster@pobox.com>
X-From: git-owner@vger.kernel.org Thu Mar 12 02:59:48 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 1LhaD5-0006wk-B7
	for gcvg-git-2@gmane.org; Thu, 12 Mar 2009 02:59:47 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755270AbZCLB5c (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 11 Mar 2009 21:57:32 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754536AbZCLB5c
	(ORCPT <rfc822;git-outgoing>); Wed, 11 Mar 2009 21:57:32 -0400
Received: from ironport1-mx.cbr1.mail-filtering.com.au ([203.88.115.241]:5125
	"EHLO ironport1-mx.cbr1.mail-filtering.com.au" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752804AbZCLB5b (ORCPT
	<rfc822;git@vger.kernel.org>); Wed, 11 Mar 2009 21:57:31 -0400
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AkIDAEMJuEnLWHaZ/2dsb2JhbACUOYF9vAYBhAwG
X-IronPort-AV: E=Sophos;i="4.38,346,1233493200"; 
   d="scan'208";a="2018798"
Received: from cherry.cbr.hosting-server.com.au ([203.88.118.153])
  by ironport1-mta.cbr1.mail-filtering.com.au with ESMTP; 12 Mar 2009 12:57:17 +1100
Received: (qmail 1358 invoked by uid 48); 12 Mar 2009 12:57:09 +1100
Received: from  ( [unknown]) by webmail.fussycoder.id.au (Horde MIME
	library) with HTTP; Thu, 12 Mar 2009 12:57:09 +1100
In-Reply-To: <7veix33f5e.fsf@gitster.siamese.dyndns.org>
Content-Disposition: inline
User-Agent: Internet Messaging Program (IMP) H3 (4.1.5)
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/112998>

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