Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 24, 2016, 15:43 UTC
Message-ID: <xmqq60wbc24h.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160324074404.GA30574@gmail.com>

David Aguilar <davvid@gmail.com> writes:

Show 10 quoted lines

> We can probably do this without introducing a new file.  One
> possible home for this is with the rest of the "default"
> definitions of the functions in git-mergetool--lib.sh's
> setup_tool() function.
>
> But, that hints that we expect tools to override it.
>
> A better place would be as a normal function inside
> git-mergetool--lib.sh, which more strongly hints that we do not
> expect tools to override mergetool_find_win32_cmd().

Thanks for a clearly described set of rules that people can easily follow.

$ 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.