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

Re: [PATCH] mergetool--lib: refactor {diff,merge}_cmd logic

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 17, 2013, 20:13 UTC
Message-ID
<7vtxkwbin7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAJDDKr5ewcYgtZn-oCQ5b=rGix5EALRdiSaNMatOwtP75e0h3g@mail.gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 11 quoted lines
> On Sun, Jun 16, 2013 at 10:51 AM, John Keeping <john@keeping.me.uk> wrote:
>> Instead of needing a wrapper to call the diff/merge command, simply
>> provide the diff_cmd and merge_cmd functions for user-specified tools in
>> the same way as we do for built-in tools.
>>
>> Signed-off-by: John Keeping <john@keeping.me.uk>
>> ---
>
> This is a nice cleanup.
>
> Acked-by: David Aguilar <davvid@gmail.com>
Thanks, both.
Previous: David Aguilar
Message 3 of 3 in “mergetool--lib: refactor {diff,merge}_cmd logic”
  1. mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping, Jun 16, 2013
  2. David AguilarJun 17, 2013
  3. Junio C HamanoJun 17, 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.