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, 06:48 UTC
Message-ID
<20200424064805.GB44448@Carlos-MBP>
In-Reply-To
<CANYt6aFi+6vKRD71digEh-D0RKkLPBRtek5t8zA-8_cPzwexkQ@mail.gmail.com>
does it say it is "not currently available" if you run:
  $ git mergetool --tool-help
does it work if you do :
  $ git config --global merge.guitool p4merge
  $ git config --global mergetool.p4merge.trustExitCode true
or change your PATH to include the location of the tool?
Carlo
PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt
Previous: Lars FrickeNext: Lars Fricke
Message 2 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.