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

Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 19, 2008, 21:50 UTC
Message-ID
<7vmyh05k6j.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1224376850.19061.1.camel@mattlaptop2.local>
Matt McCutchen <matt@mattmccutchen.net> writes:
> This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
> but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.
Good eyes; thanks.
Previous: Matt McCutchen
Message 2 of 2 in “git-merge-recursive: honor merge.conflictstyle once again”
  1. git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen, Oct 19, 2008
  2. Junio C HamanoOct 19, 2008

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.