mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2023-06-24 16:48:43 -07:00
parent 577bbd8c9f 34d765e736
commit 685eb5d25c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6406-merge-attr.sh
View File

@ -168,7 +168,7 @@ test_expect_success 'custom merge backend' '
rm -f $o $a $b rm -f $o $a $b
' '
test_expect_success 'custom merge driver that is killed with a signal' ' test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' '
test_when_finished "rm -f output please-abort" && test_when_finished "rm -f output please-abort" &&
git reset --hard anchor && git reset --hard anchor &&