Hi Junio & Duy, On Thu, 9 May 2019, Junio C Hamano wrote:
> * nd/merge-quit (2019-05-07) 2 commits > - merge: add --quit > - merge: remove drop_save() in favor of remove_merge_branch_state() > > "git merge" learned "--quit" option that cleans up the in-progress > merge while leaving the working tree and the index still in a mess. > > Hmph, why is this a good idea? It also seems to work *only* on Linux. At least the tests break on macOS and on Windows: https://dev.azure.com/gitgitgadget/git/_build/results?buildId=8313&view=ms.vss-test-web.build-test-results-tab Sadly, I ran out of time do look into this (I am pretty busy preparing Git for Windows for v2.22.0-rc0). Ciao, Dscho
