summaryrefslogtreecommitdiff
path: root/test/scripts/continuous-merge-test-run-1.sh
Commit message (Expand)AuthorAgeFilesLines
* Increase timeouts waiting for merge.Linus Nordberg2016-12-011-3/+3
* Sleep less in tests.Linus Nordberg2016-11-251-14/+4
* Manual rebase onto master with map/robust-distribution.Linus Nordberg2016-11-251-0/+58