diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-29 16:43:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-29 16:43:21 -0700 |
| commit | 3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8 (patch) | |
| tree | 256f0aebc98100cdf485b1c38b3dd2c74e7b8f90 /builtin/commit.c | |
| parent | Merge branch 'en/header-split-cache-h-part-3' (diff) | |
| parent | t6406: skip "external merge driver getting killed by a signal" test on Windows (diff) | |
| download | git-3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8.tar.gz git-3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions