commit 5a7e3ec980d096c751d5892598af3edb953cbcab
author Bence Szépkúti <bence.szepkuti@arm.com> Mon Jul 17 19:05:57 2023 +0200
committer Bence Szépkúti <bence.szepkuti@arm.com> Mon Jul 17 19:13:36 2023 +0200
tree db086da0b66641df6e3eb2d548fe4287c0d8928c
parent 19280ad9b34f9a0d270a9d605cbd4e988cd69fa6

Dummy check for merge conflict testing

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>

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