]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1264a0 34d765e)
Merge branch 'jc/abort-ll-merge-with-a-signal'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Jun 2023 23:43:21 +0000 (16:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Jun 2023 23:43:21 +0000 (16:43 -0700)
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

1  2 
merge-ll.c patch | diff1 | diff2 | blob | history

diff --cc merge-ll.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.