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

Re: p4merge no longer working after upgrade to 2.26.0

From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date
Apr 24, 2020, 07:20 UTC
Message-ID
<20200424072049.GC44448@Carlos-MBP>
In-Reply-To
<CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com>
On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:
> 
> git mergetool --tool-help indeed does NOT list p4merge.
but does show if you run :
  $ PATH=$PATH:/opt/perforce/bin
> So support was discontinued?

no; something else might be broken (hopefully only in your setup) it seems to work at least on mine :

  $ git version
  git version 2.26.2.266.ge870325ee8
  $ git config --list | grep p4
  merge.tool=p4merge
Carlo
Previous: Lars FrickeNext: Lars Fricke
Message 5 of 10 in “p4merge no longer working after upgrade to 2.26.0”
  1. Lars FrickeApr 24, 2020
  2. Carlo Marcelo Arenas BelónApr 24, 2020
  3. Lars FrickeApr 24, 2020
  4. Lars FrickeApr 24, 2020
  5. Carlo Marcelo Arenas BelónApr 24, 2020
  6. Lars FrickeApr 24, 2020
  7. Lars FrickeApr 24, 2020
  8. Danh DoanApr 25, 2020
  9. Luke DiamandApr 27, 2020
  10. Lars FrickeApr 27, 2020

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.