Re: p4merge no longer working after upgrade to 2.26.0

From: Lars Fricke <lars.fricke@gmail.com>
Date: Apr 24, 2020, 06:57 UTC
Message-ID: <CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com>
In-Reply-To: <20200424064805.GB44448@Carlos-MBP>

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@gmail.com> wrote:

Show 15 quoted lines

>
> 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