commit 0ffd04ab15b0db42a0d97c5b51282553429fcdb0
author Bence Szépkúti <bence.szepkuti@arm.com> Mon Jul 17 22:03:20 2023 +0000
committer GitHub <noreply@github.com> Mon Jul 17 22:03:20 2023 +0000
tree b972048c544a83d43dd5fcce89ebe09e1d066e29
parent 5a7e3ec980d096c751d5892598af3edb953cbcab
parent 508d2192bb647a2d04d285145b7b5d88a57ee4e9

Merge pull request #7919 from bensze01/dev/bensze01/merge-queue-test-2

Test PR for Github merge queues #2

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index d162d31..e42665b 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -918,6 +918,11 @@
 #
 # Indicative running times are given for reference.
 
+component_check_simulated_silent_merge_conflict () {
+    msg "Check: simulated silent merge conflict"
+    [ ! -e merge_conflict.txt ]
+}
+
 component_check_recursion () {
     msg "Check: recursion.pl" # < 1s
     tests/scripts/recursion.pl library/*.c