From: "Carlo Marcelo Arenas Belón" <carenas@gmail•com>
To: lars.fricke@googlemail•com
Cc: git@vger•kernel.org
Subject: Re: p4merge no longer working after upgrade to 2.26.0
Date: Fri, 24 Apr 2020 00:20:49 -0700 [thread overview]
Message-ID: <20200424072049.GC44448@Carlos-MBP> (raw)
In-Reply-To: <CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com>
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
next prev parent reply other threads:[~2020-04-24 7:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 4:39 p4merge no longer working after upgrade to 2.26.0 Lars Fricke
2020-04-24 6:48 ` Carlo Marcelo Arenas Belón
2020-04-24 6:57 ` Lars Fricke
2020-04-24 7:09 ` Lars Fricke
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón [this message]
2020-04-24 7:25 ` Lars Fricke
2020-04-24 9:28 ` Lars Fricke
2020-04-25 6:52 ` Danh Doan
2020-04-27 11:31 ` Luke Diamand
2020-04-27 11:45 ` Lars Fricke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200424072049.GC44448@Carlos-MBP \
--to=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=lars.fricke@googlemail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox