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

Re: git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Aug 11, 2011, 09:48 UTC
Message-ID
<CAHGBnuM=nadYNOH8rPzenttYmNwyz04FsPyvavWD1UDUbF4v8A@mail.gmail.com>
In-Reply-To
<20110811093731.GB29507@gmail.com>
On Thu, Aug 11, 2011 at 11:37, David Aguilar <davvid@gmail.com> wrote:
Show 6 quoted lines
> What's the best way to use this and not break existing users?
>
> meld v1.5.0 was released in December.
> We could parse `meld --version` and use the new --output flag on
> newer setups, leaving old setups alone.  That's a lot of
> code to carry around but it's nicest to users.
I'd definitely prefer this solution, as it's the most convenient for users.
-- 
Sebastian Schuberth
Previous: David Aguilar
Message 7 of 7 in “Re: git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED”
  1. Jonathan NiederAug 10, 2011
  2. Tanguy OrtoloAug 10, 2011
  3. Sebastian SchuberthAug 10, 2011
  4. David AguilarAug 11, 2011
  5. Jonathan NiederAug 11, 2011
  6. David AguilarAug 11, 2011
  7. Sebastian SchuberthAug 11, 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.