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: Thu, 23 Apr 2020 23:48:05 -0700 [thread overview]
Message-ID: <20200424064805.GB44448@Carlos-MBP> (raw)
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
next prev parent reply other threads:[~2020-04-24 6:48 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 [this message]
2020-04-24 6:57 ` Lars Fricke
2020-04-24 7:09 ` Lars Fricke
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
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=20200424064805.GB44448@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