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

Re: [PATCH] mergetool--lib: add diffmerge as a pre-configured mergetool option

From
Jay Soffian <jaysoffian@gmail.com>
Date
Dec 10, 2009, 00:16 UTC
Message-ID
<76718490912091616n250a4b93h941c91b572c5be1c@mail.gmail.com>
In-Reply-To
<7vaaxrn10o.fsf@alter.siamese.dyndns.org>
On Wed, Dec 9, 2009 at 4:08 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> Perhaps it is a better approach to first eject bulk of code for the
> backends we currently support under these case statements into separate
> files, one per backend, move them to mergetool/ subdirectory in the source
> tree, install them as "$(share)/git-core/mergetool/$toolname", and at
> runtime source them?  That way, a patch to add a new backend can be as
> simple as adding a new file in mergetool/ and doing nothing else.  Also an
> end user can privately add support to a new backend much more easily.
>
> Anybody want to try that approach?
Sure. There may also be value in emulating the mercurial approach:
  http://mercurial.selenic.com/wiki/MergeToolConfiguration
I'll give both a shot.
j.
Previous: Junio C HamanoNext: David Aguilar
Message 5 of 7 in “mergetool--lib: add diffmerge as a pre-configured mergetool option”
  1. mergetool--lib: add diffmerge as a pre-configured mergetool optionJay Soffian, Dec 8, 2009
  2. Charles BaileyDec 9, 2009
  3. Jay SoffianDec 9, 2009
  4. Junio C HamanoDec 10, 2009
  5. Jay SoffianDec 10, 2009
  6. David AguilarAug 16, 2011
  7. Junio C HamanoAug 16, 2011

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.