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

Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim

From
Jeff King <peff@peff.net>
Date
Sep 24, 2010, 21:38 UTC
Message-ID
<20100924213852.GB19676@sigill.intra.peff.net>
In-Reply-To
<20100924190928.GC3768@vfa-6z.perlninja.com>
On Fri, Sep 24, 2010 at 12:09:28PM -0700, Jacob Helwig wrote:
Show 9 quoted lines
> > So are these patches good to go forward with? No major objections in a
> > over a week's time.
> > 
> > -Dan
> 
> I'd +1 David's suggestion of calling this "vimdiff3", I'd like to still
> be able to access the current behavior, since I have merge.conflictstyle
> = diff3, and already see the merge base when I use (g)vimdiff with
> mergetool.

Of course as soon as I say "nobody objected" in my other email, this arrives. :)

Can we provide both, but make the vimdiff3 behavior the preferred default? It better matches the default merge.conflictstyle, and people who are using diff3 obviously understand how to tweak config.

-Peff
Previous: Jacob HelwigNext: David Aguilar
Message 7 of 10 in “mergetool-lib: combine vimdiff and gvimdiff run blocks”
  1. 1/2 mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee, Sep 15, 2010
  2. 2/2 mergetool-lib: add a three-way diff view for vim/gvimDan McGee, Sep 15, 2010
  3. David AguilarSep 18, 2010
  4. Felipe ContrerasSep 19, 2010
  5. Dan McGeeSep 24, 2010
  6. Jacob HelwigSep 24, 2010
  7. Jeff KingSep 24, 2010
  8. David AguilarSep 25, 2010
  9. 2/2 mergetool-lib: add a three-way diff view for vim/gvimDan McGee, Sep 27, 2010
  10. Jeff KingSep 24, 2010

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.