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

Re: [PATCH 1/2] mergetools: split config files for vim and gvim

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 28, 2012, 20:53 UTC
Message-ID
<7vr4wctpl7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1332964693-4058-1-git-send-email-tim.henigan@gmail.com>
Tim Henigan <tim.henigan@gmail.com> writes:
Show 5 quoted lines
> One side-effect of this change which may be a problem is that we
> lose support for the 'vimdiff2' and 'gvimdiff2' tools that were
> created in 0008669 (mergetool-lib: make the three-way diff the
> default for vim/gvim).  The 2-panel options were not advertised in
> any way, so I don't know if it is important to keep them.

By default, anything we support is important unless there is a sound justification to say otherwise. I think they were kept for people who were already used to the 2-pane version when 3-pane one was introduced.

But I will not be a good judge for this particular case, as I do not use vim nor gvim for merge resolution. Davidd?

Previous: Junio C Hamano
Message 4 of 4 in “mergetools: split config files for vim and gvim”
  1. 1/2 mergetools: split config files for vim and gvimTim Henigan, Mar 28, 2012
  2. 2/2 mergetools: fail if display needed but not presentTim Henigan, Mar 28, 2012
  3. Junio C HamanoMar 28, 2012
  4. Junio C HamanoMar 28, 2012

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.