diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-07 14:41:59 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-07 14:41:59 +0100 |
| commit | 71cc72d3c5e977355ebb0aa8bcb065a08207ec2f (patch) | |
| tree | 1cdb0030b875fae416f45f138c4c85c58afa2ea2 /tools/merge | |
| parent | 81292083fab81009ac9b1401947feefd094b9384 (diff) | |
Parallelised merge, sth phase.
Diffstat (limited to 'tools/merge')
| -rwxr-xr-x | tools/merge | 6 |
1 files changed, 3 insertions, 3 deletions
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 "$@" |