git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/5] t1000: fix case table.

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Apr 7, 2007, 18:01 UTC
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:
Show 5 quoted lines
> 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*
Previous: Junio C Hamano
Message 2 of 2 in “t1000: fix case table.”
  1. 1/5 t1000: fix case table.Junio C Hamano, Apr 7, 2007
  2. Daniel BarkalowApr 7, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.