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

Re: [PATCH] fixup! mergetools: simplify how we handle "vim" and "defaults"

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 29, 2013, 03:02 UTC
Message-ID
<7vy5fcu1wo.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAJDDKr5wsYqnBk+kvKj1qzUYKJBJ5nAiwMJZ=HpzPPgJf8BBTQ@mail.gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 6 quoted lines
> On Mon, Jan 28, 2013 at 11:28 AM, John Keeping <john@keeping.me.uk> wrote:
>> ---
>> Junio, please can you squash this into f9924e5 on jk/mergetool,
>> providing that David is OK with that?
>
> This looks good to me.

Thanks for a quick response. Will squash this in and rebuild the two affected branches.

Previous: David Aguilar
Message 3 of 3 in “fixup! mergetools: simplify how we handle "vim" and "defaults"”
  1. fixup! mergetools: simplify how we handle "vim" and "defaults"John Keeping, Jan 28, 2013
  2. David AguilarJan 29, 2013
  3. Junio C HamanoJan 29, 2013

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.