{"thread":{"id":"54523","subject":"git mergetool does not work since 2.29.0","startedAt":"2020-10-28T22:05:25Z","lastAt":"2020-12-01T20:59:45Z","messageCount":2,"participants":["Zaoshi","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"408563","messageId":"a284dc99-7da3-a313-6d9b-1dd40cbc5b22@gmail.com","threadId":"54523","inReplyTo":null,"subject":"git mergetool does not work since 2.29.0","fromName":"Zaoshi","fromEmail":"kabazaoshi@gmail.com","sentAt":"2020-10-28T07:25:25Z","receivedAt":"2020-10-28T22:05:25Z","isPatch":false,"sender":{"key":"kabazaoshi@gmail.com","avatar":null},"body":"Hello,\n\nI have tried using 'git bugreport' but could not figure out how to edit \ntext in the console and send report, so I'm just reusing that form in \nthis email. Let me know if any other information is needed.\n\nWhat did you do before the bug happened?\nRan the following commands:\ngit checkout mybranch\ngit merge master\ngit mergetool\n\nWhat did you expect to happen?\nI expected git to open my configured mergetool\n\nWhat happened instead?\nIt fails with message \"merge of myfile.cs failed\"\n\nWhat's different between what you expected and what actually happened?\nMerge does not work.\n\nAnything else you want to add:\nThis issue started to happen since git version 2.29.0. Earlier versions \nwork as expected.\n\n.gitconfig:\n[core]\n     editor = \\\"C:\\\\Microsoft VS Code\\\\Code.exe\\\" --wait\n[user]\n     name = myname\n     email = myemail\n[fetch]\n     prune = true\n[pull]\n     rebase = true\n[diff]\n     tool = bc4\n[merge]\n     tool = bc4\n[difftool \"bc4\"]\n     cmd = \\\"c:\\\\Program Files\\\\Beyond Compare 4\\\\bcomp.exe\\\" $LOCAL $REMOTE\n     trustExitCode = true\n[mergetool \"bc4\"]\n     cmd = \\\"c:\\\\Program Files\\\\Beyond Compare 4\\\\bcomp.exe\\\" $LOCAL \n$REMOTE $BASE $MERGED\n     trustExitCode = true\n\n[System Info]\ngit version:\ngit version 2.29.1.windows.1\ncpu: x86_64\nbuilt from commit: e6d53c456169235fe72602e2b4d985934fa9ad23\nsizeof-long: 4\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Windows 10.0 19041\ncompiler info: gnuc: 10.2\nlibc info: no libc information available\n$SHELL (typically, interactive shell): <unset>\n\n\n[Enabled Hooks]\n\n\nRegards,\nZ\n\n"},{"id":"411102","messageId":"nycvar.QRO.7.76.6.2012012153310.54@tvgsbejvaqbjf.bet","threadId":"54523","inReplyTo":"a284dc99-7da3-a313-6d9b-1dd40cbc5b22@gmail.com","subject":"Re: git mergetool does not work since 2.29.0","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-12-01T20:58:09Z","receivedAt":"2020-12-01T20:59:45Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 28 Oct 2020, Zaoshi wrote:\n\n> [difftool \"bc4\"]\n>     cmd = \\\"c:\\\\Program Files\\\\Beyond Compare 4\\\\bcomp.exe\\\" $LOCAL $REMOTE\n>     trustExitCode = true\n\nI believe that this is fixed as per\nhttps://github.com/gitgitgadget/git/pull/787. It has also been merged into\nGit for Windows' `main` branch via\nhttps://github.com/git-for-windows/git/pull/2899. This means that it\nshould be fixed in the latest snapshot:\nhttps://wingit.blob.core.windows.net/files/index.html\n\nCiao,\nJohannes\n"}]}