summaryrefslogtreecommitdiff
path: root/tools/merge
diff options
context:
space:
mode:
Diffstat (limited to 'tools/merge')
-rwxr-xr-xtools/merge2
1 files changed, 1 insertions, 1 deletions
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 "$@"