diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-02 02:47:49 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-02 02:47:49 +0100 |
| commit | 6610afbf6a5e802fc15733d6a499281cd981af13 (patch) | |
| tree | dfdfc005008c84abfd7623d9de15970f3ed687e0 /tools/merge | |
| parent | b7b8903b6a7c3342933b9984afa72fb6527b5f72 (diff) | |
Parallelised merge, backup phase.
Diffstat (limited to 'tools/merge')
| -rwxr-xr-x | tools/merge | 2 |
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 "$@" |