Thanks Carlo for the pointers git mergetool --tool-help indeed does NOT list p4merge. So support was discontinued? Configuring it as merge.guitool also does not work. Regards, Lars On Fri, Apr 24, 2020 at 8:48 AM Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> wrote: > > 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
