From 02fcf746ef5a884d3d17feabee8a85204f330476 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 20 Jun 2017 15:22:57 +0200
Subject: [PATCH] Updated merge syntax

---
 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 9b69e55..cd2a694 100755
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@@ -297,7 +297,7 @@ function setUp () {
 
 function test_Merge () {
 	cd "$DEV_DIR"
-	./merge.sh
+	./merge.sh obackup
 	assertEquals "Merging code" "0" $?
 
 	cd "$OBACKUP_DIR"