From d60b69e2e00e31222be61f5f2933d4e12099f23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= <bence.szepkuti@arm.com>
Date: Mon, 17 Jul 2023 19:05:57 +0200
Subject: [PATCH] Dummy check for merge conflict testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
---
 tests/scripts/all.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index d162d31782c3..e42665b1022b 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -918,6 +918,11 @@ helper_libtestdriver1_make_main() {
 #
 # 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