From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Jun 2023 23:43:21 +0000 (-0700)
Subject: Merge branch 'jc/abort-ll-merge-with-a-signal'
X-Git-Tag: v2.42.0-rc0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8;p=thirdparty%2Fgit.git

Merge branch 'jc/abort-ll-merge-with-a-signal'

When the external merge driver is killed by a signal, its output
should not be trusted as a resolution with conflicts that is
proposed by the driver, but the code did.

* jc/abort-ll-merge-with-a-signal:
  t6406: skip "external merge driver getting killed by a signal" test on Windows
  ll-merge: killing the external merge driver aborts the merge
---

3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8