From b7b8903b6a7c3342933b9984afa72fb6527b5f72 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 24 Jan 2017 09:16:28 +0100
Subject: Parallelised merge, distribution phase.

---
 tools/merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/merge')

diff --git a/tools/merge b/tools/merge
index b5a50d5..0d3f36c 100755
--- a/tools/merge
+++ b/tools/merge
@@ -7,4 +7,4 @@ BINDIR=$(dirname $0)
 $BINDIR/merge_fetch.py "$@"
 $BINDIR/merge_backup.py "$@"
 $BINDIR/merge_sth.py "$@"
-$BINDIR/merge_dist.py "$@"
+#$BINDIR/merge_dist.py "$@"
-- 
cgit v1.1