From mboxrd@z Thu Jan  1 00:00:00 1970
From: Darrin Thompson <darrint@progeny.com>
Subject: Re: Multi-ancestor read-tree notes
Date: Thu, 08 Sep 2005 16:54:55 -0500
Message-ID: <1126216495.3984.4.camel@localhost.localdomain>
References: <Pine.LNX.4.63.0509050049030.23242@iabervon.org>
	 <1126199765.3984.1.camel@localhost.localdomain>
	 <Pine.LNX.4.63.0509081727560.23242@iabervon.org>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Sep 08 23:57:17 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1EDUMK-0001no-Sk
	for gcvg-git@gmane.org; Thu, 08 Sep 2005 23:55:05 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S964960AbVIHVy5 (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Thu, 8 Sep 2005 17:54:57 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965005AbVIHVy5
	(ORCPT <rfc822;git-outgoing>); Thu, 8 Sep 2005 17:54:57 -0400
Received: from zealot.progeny.com ([216.37.46.162]:63921 "EHLO
	morimoto.progeny.com") by vger.kernel.org with ESMTP
	id S964960AbVIHVy4 (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 8 Sep 2005 17:54:56 -0400
Received: from localhost.localdomain (morimoto.progeny.com [192.168.1.53])
	by morimoto.progeny.com (Postfix) with ESMTP
	id 9E934636A4; Thu,  8 Sep 2005 16:54:55 -0500 (EST)
To: Daniel Barkalow <barkalow@iabervon.org>
In-Reply-To: <Pine.LNX.4.63.0509081727560.23242@iabervon.org>
X-Mailer: Evolution 2.2.3 
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/8221>

On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote:
> I assume that what you want is something to include everything from two 
> commits, which would give conflicts if a name is reused?
> 

Yes.

--
Darrin