summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test-prepare-merge-takeover.sh
Commit message (Expand)AuthorAgeFilesLines
* merge_sth.py doesn't do the right thing when 'sth' is missing.erlmerge_backupLinus Nordberg2017-02-021-0/+1
* Parallelised merge, distribution phase.erlmerge_distLinus Nordberg2017-02-011-0/+1
* Test failing merge backupMagnus Ahltorp2016-10-141-1/+1
* Make tests run independently from cwdMagnus Ahltorp2016-10-131-9/+7
* Specify where to source test.shvars from ('./').Linus Nordberg2016-10-061-1/+1
* Move tests to shell scriptsMagnus Ahltorp2016-10-051-0/+16