diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-01-27 16:35:21 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-01-30 09:54:08 +0100 |
| commit | 2e54755b9afacdb2d001b7ad4a81a8a23b6f43e0 (patch) | |
| tree | b258faa94aaf6115dda8dc5117c443b2d5e8d6df /tools/merge | |
| parent | 6df4a9012f03af16779ae4172831367881b4090b (diff) | |
Parallelised merge, distribution 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 b5a50d5..0d3f36c 100755 --- a/tools/merge +++ b/tools/merge @@ -7,4 +7,4 @@ BINDIR=$(dirname $0) $BINDIR/merge_fetch.py "$@" $BINDIR/merge_backup.py "$@" $BINDIR/merge_sth.py "$@" -$BINDIR/merge_dist.py "$@" +#$BINDIR/merge_dist.py "$@" |