Just to help anyone who runs into the same problem. For whatever reason (maybe broken package on SLES) the wrapper p4merge was missing from $(git --exec_path)/mergetools. I just put the version from the official repo there and everything works. Thanks again for your help Kind regards Lars On Fri, Apr 24, 2020 at 9:25 AM Lars Fricke <lars.fricke@xxxxxxxxx> wrote: > > Setting path explicitly does not help either. Some other colleagues > are having the same problem. > So it might be related to our OS (SLES 12 SP4) > > Thanks for your help so far. As you said - the issue seems to be on our end. > I am currently digging through git-mergetool--lib.sh to find out why > it thinks that p4merge is not a valid tool. > > Thanks again for your help > Lars > > On Fri, Apr 24, 2020 at 9:20 AM Carlo Marcelo Arenas Belón > <carenas@xxxxxxxxx> wrote: > > > > 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
