From 71cc72d3c5e977355ebb0aa8bcb065a08207ec2f Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 7 Feb 2017 14:41:59 +0100
Subject: Parallelised merge, sth phase.

---
 tools/merge | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/merge')

diff --git a/tools/merge b/tools/merge
index d0198ec..19e22f8 100755
--- a/tools/merge
+++ b/tools/merge
@@ -5,6 +5,6 @@ set -o errexit
 BINDIR=$(dirname $0)
 
 $BINDIR/merge_fetch.py "$@"
-#$BINDIR/merge_backup.py "$@"
-$BINDIR/merge_sth.py "$@"
-#$BINDIR/merge_dist.py "$@"
+# $BINDIR/merge_backup.py "$@"
+# $BINDIR/merge_sth.py "$@"
+# $BINDIR/merge_dist.py "$@"
-- 
cgit v1.1