From 6610afbf6a5e802fc15733d6a499281cd981af13 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Thu, 2 Feb 2017 02:47:49 +0100
Subject: Parallelised merge, backup phase.

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

(limited to 'tools/merge')

diff --git a/tools/merge b/tools/merge
index 0d3f36c..d0198ec 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_backup.py "$@"
 $BINDIR/merge_sth.py "$@"
 #$BINDIR/merge_dist.py "$@"
-- 
cgit v1.1