| commit | 3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Jun 2023 23:43:21 +0000 (29 16:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Jun 2023 23:43:21 +0000 (29 16:43 -0700) | ||
| tree | 256f0aebc98100cdf485b1c38b3dd2c74e7b8f90 | treesnapshot (tar.gz zip) |
| parent | a1264a08a1a6e0cd7e510c899cd0ba42dcf1045d | commitdiff |
| parent | 34d765e736e015f5c4790db2c0a1d3ddbd4bd3e9 | commitdiff |
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
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
| merge-ll.c | diff1 | diff2 | blobhistory |