diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:29:00 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:37:29 +0100 |
| commit | 616be2a18cea1ecfee327105a58f4f397a7e28f1 (patch) | |
| tree | 520ea9a3fbe29ac78ce76c4b4527a70e8a70ae1d /test/scripts/continuous-merge-start.sh | |
| parent | d8ce0c149f10d841dc19cbc32c8fc844aa4d65fb (diff) | |
Manual rebase onto master with map/robust-distribution.
Diffstat (limited to 'test/scripts/continuous-merge-start.sh')
| -rwxr-xr-x | test/scripts/continuous-merge-start.sh | 10 |
1 files changed, 10 insertions, 0 deletions
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 |