From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sat, 07 Apr 2007 18:01:45 GMT
Subject: Re: [PATCH 1/5] t1000: fix case table.
Message-ID: <Pine.LNX.4.64.0704071400190.27922@iabervon.org>
In-Reply-To: <7vbqi0ckpn.fsf@assigned-by-dhcp.cox.net>

On Sat, 7 Apr 2007, Junio C Hamano wrote:

> Case #10 is not handled with unpack-trees.c:threeway_merge()
> internally, unless under the agressive rule, and it is not a
> bug.  As the test expects, ND (one side did not do anything,
> other side deleted) case was meant to be handled by the caller's
> policy (e.g. git-merge-one-file or git-merge-recursive).

Looks like I neglected to update (or remove) that table; 
Documentation/technical/trivial-merge.txt agrees with your change.

	-Daniel
*This .sig left intentionally blank*