From 616be2a18cea1ecfee327105a58f4f397a7e28f1 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Nov 2016 14:29:00 +0100
Subject: Manual rebase onto master with map/robust-distribution.

---
 test/scripts/continuous-merge-start.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 test/scripts/continuous-merge-start.sh

(limited to 'test/scripts/continuous-merge-start.sh')

diff --git a/test/scripts/continuous-merge-start.sh b/test/scripts/continuous-merge-start.sh
new file mode 100755
index 0000000..5791d12
--- /dev/null
+++ b/test/scripts/continuous-merge-start.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -o nounset
+set -o errexit
+
+top_srcdir=$(cd $(dirname $0)/../..; pwd)
+
+. ${top_srcdir}/test/scripts/testutils.sh
+
+do_merge --mergeinterval 10 --pidfile merge.pid
-- 
cgit v1.1