git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git mergetool does not work since 2.29.0

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 1, 2020, 20:58 UTC
Message-ID
<nycvar.QRO.7.76.6.2012012153310.54@tvgsbejvaqbjf.bet>
In-Reply-To
<a284dc99-7da3-a313-6d9b-1dd40cbc5b22@gmail.com>
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

Previous: Zaoshi
Message 2 of 2 in “git mergetool does not work since 2.29.0”
  1. ZaoshiOct 28, 2020
  2. Johannes SchindelinDec 1, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.