Junio C Hamano <gitster@xxxxxxxxx> writes: > Elijah Newren <newren@xxxxxxxxx> writes: > >> Reviewed-by: Elijah Newren <newren@xxxxxxxxx> > > > Thanks for a quick review. Unfortunately Windows does not seem to correctly detect the aborting merge driver. Does run_command() there report process death due to signals differently, I wonder? https://github.com/git/git/actions/runs/5360400800/jobs/9725341775#step:6:285 shows that on Windows, aborted external merge driver is not noticed and we happily take the auto-merged result, ouch. I am tempted to protect this step of the test with a prerequisite to skip it on Windows for now. Anybody with better idea? Thanks.
