From 616be2a18cea1ecfee327105a58f4f397a7e28f1 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 25 Nov 2016 14:29:00 +0100 Subject: Manual rebase onto master with map/robust-distribution. --- test/scripts/continuous-merge-stop.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 test/scripts/continuous-merge-stop.sh (limited to 'test/scripts/continuous-merge-stop.sh') diff --git a/test/scripts/continuous-merge-stop.sh b/test/scripts/continuous-merge-stop.sh new file mode 100755 index 0000000..f6632f8 --- /dev/null +++ b/test/scripts/continuous-merge-stop.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -o nounset + +kill $(cat merge.pid) +exit 0 -- cgit v1.1