From: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date: Fri, 24 Apr 2020 06:48:05 GMT
Subject: Re: p4merge no longer working after upgrade to 2.26.0
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