diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-01-24 09:16:28 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-01 11:24:28 +0100 |
| commit | b7b8903b6a7c3342933b9984afa72fb6527b5f72 (patch) | |
| tree | fc92bfb8b1dccd1dca3f24cba98cf3ea540687bc /tools/merge | |
| parent | c0d8aceccb0961a25ee58a163441bbcbe6d6ea3d (diff) | |
Parallelised merge, distribution phase.erlmerge_dist
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 "$@" |