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

p4merge no longer working after upgrade to 2.26.0

From
LFLars Fricke <lars.fricke@gmail.com>
Date
Apr 24, 2020, 04:39 UTC
Message-ID
<CANYt6aFi+6vKRD71digEh-D0RKkLPBRtek5t8zA-8_cPzwexkQ@mail.gmail.com>
Dear git community,
I recently upgraded to git 2.26.0 and this broke my merge/difftool p4merge.
This is my config with regards to the mergetool

merge.tool=p4merge mergetool.p4merge.path=/opt/perforce/bin/p4merge mergetool.p4merge.prompt=false

and this is the error message I am getting. Funnily enough p4merge is mentioned in the alternatives

git config option merge.tool set to unknown tool: p4merge Resetting to default...This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff

Colleagues of mine reported that it is still working in 2.25.4
Kind regards
Lars Fricke
Next: Carlo Marcelo Arenas Belón
Message 1 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.