From d9e22b06e5daa7cb06c2737b2d858b052f13b8c7 Mon Sep 17 00:00:00 2001
From: Orsiris de Jong <ozy@netpower.fr>
Date: Sun, 11 Jun 2023 11:26:02 +0200
Subject: [PATCH] Add preflight merge

---
 dev/tests/run_tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh
index 2624990..9c6c584 100755
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@@ -200,6 +200,10 @@ function PrepareLocalDirs () {
 function oneTimeSetUp () {
 	START_TIME=$SECONDS
 
+	echo "Running forced merge"
+	cd "${DEV_DIR}"
+	./merge.sh osync
+
 	echo "Running install.sh from ${OSYNC_DIR}"
 	ls -alh ${OSYNC_DIR}
 	$SUDO_CMD ${OSYNC_DIR}/install.sh --prefix="${FAKEROOT}"