From 29dc7a3e9e1acee0bc424a53b3777747bf0f0afd Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Mon, 19 Jun 2017 16:01:47 +0200
Subject: [PATCH] Merge now requires program name

---
 dev/tests/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh
index abf3106..57642c5 100755
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@@ -285,7 +285,7 @@ function setUp () {
 # This test has to be done everytime in order for osync executable to be fresh
 function test_Merge () {
 	cd "$DEV_DIR"
-	./merge.sh
+	./merge.sh osync
 	assertEquals "Merging code" "0" $?
 
 	cd "$OSYNC_DIR"