11:31 ` Luke Diamand 0 siblings, 1 reply 10+ messages in thread > On Fri, at 9:20 AM Carlo Marcelo Arenas Belón > it thinks that p4merge is not a valid tool. > I am currently digging through git-mergetool-lib.sh to find out why As you said - the issue seems to be on our end. > So it might be related to our OS (SLES 12 SP4) > Setting path explicitly does not help either. I just put the version from the official repo there and everything works. Was missing from $(git -exec_path)/mergetools. Just to help anyone who runs into the same problem.įor whatever reason (maybe broken package on SLES) the wrapper p4merge 6:52 ` Danh Doan 0 siblings, 1 reply 10+ messages in thread > no something else might be broken (hopefully only in your setup) On Fri, at 9:20 AM Carlo Marcelo Arenas Belón It thinks that p4merge is not a valid tool. I am currently digging through git-mergetool-lib.sh to find out why So it might be related to our OS (SLES 12 SP4) Setting path explicitly does not help either. 9:28 ` Lars Fricke 0 siblings, 1 reply 10+ messages in thread 7:20 ` Carlo Marcelo Arenas Belón 7:25 ` Lars Fricke
No something else might be broken (hopefully only in your setup) 7:25 ` Lars Fricke 1 sibling, 1 reply 10+ messages in threadįrom: Carlo Marcelo Arenas Belón 7:20 UTC ( / raw) 7:09 ` Lars Fricke 7:20 ` Carlo Marcelo Arenas Belón > On Fri, at 8:48 AM Carlo Marcelo Arenas Belón > Configuring it as merge.guitool also does not work. > git mergetool -tool-help indeed does NOT list p4merge. 7:20 ` Carlo Marcelo Arenas Belón 1 sibling, 0 replies 10+ messages in threadįorgot to mention - p4merge is in my PATH mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt > or change your PATH to include the location of the tool? > $ git config -global merge.guitool p4merge > does it say it is "not currently available" if you run: On Fri, at 8:48 AM Carlo Marcelo Arenas Belón Git mergetool -tool-help indeed does NOT list p4merge.Ĭonfiguring it as merge.guitool also does not work. 7:20 ` Carlo Marcelo Arenas Belón 0 siblings, 2 replies 10+ messages in thread 6:48 ` Carlo Marcelo Arenas Belón 6:57 ` Lars Fricke Or change your PATH to include the location of the tool? $ git config -global merge.guitool p4merge 6:57 ` Lars Fricke 0 siblings, 1 reply 10+ messages in threadįrom: Carlo Marcelo Arenas Belón 6:48 UTC ( / raw)ĭoes it say it is "not currently available" if you run:
#P4merge location upgrade#
4:39 p4merge no longer working after upgrade to 2.26.0 Lars 6:48 ` Carlo Marcelo Arenas Belón * Re: p4merge no longer working after upgrade to 2.26.0
Opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuseĭiffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiffĬolleagues of mine reported that it is still working in 2.25.4 'git mergetool' will now attempt to use one of the following tools: See 'git mergetool -tool-help' or 'git help config' for more details. Resetting to default.This message is displayed because 'merge.tool' Git config option merge.tool set to unknown tool: p4merge =/opt/perforce/bin/p4mergeĪnd this is the error message I am getting. This is my config with regards to the mergetool I recently upgraded to git 2.26.0 and this broke my merge/difftool p4merge. 6:48 ` Carlo Marcelo Arenas Belón 0 siblings, 1 reply 10+ messages in thread
#P4merge location archive#
P4merge no longer working after upgrade to 2.26.0 archive mirror help / color / mirror / Atom feed * p4merge no longer working after upgrade to 2.26.0 4:39 Lars Fricke
0 kommentar(er)
