From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Zaoshi <kabazaoshi@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git mergetool does not work since 2.29.0
Date: Tue, 1 Dec 2020 21:58:09 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2012012153310.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <a284dc99-7da3-a313-6d9b-1dd40cbc5b22@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi,
On Wed, 28 Oct 2020, Zaoshi wrote:
> [difftool "bc4"]
> cmd = \"c:\\Program Files\\Beyond Compare 4\\bcomp.exe\" $LOCAL $REMOTE
> trustExitCode = true
I believe that this is fixed as per
https://github.com/gitgitgadget/git/pull/787. It has also been merged into
Git for Windows' `main` branch via
https://github.com/git-for-windows/git/pull/2899. This means that it
should be fixed in the latest snapshot:
https://wingit.blob.core.windows.net/files/index.html
Ciao,
Johannes
prev parent reply other threads:[~2020-12-01 20:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 7:25 git mergetool does not work since 2.29.0 Zaoshi
2020-12-01 20:58 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.2012012153310.54@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kabazaoshi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).