Alexander Larsson 9648cc5eaa tests: Revert the --merge option ...

This is causing the tests to hang on errors sometimes.

2020-03-24 20:14:29 +01:00

..

glib-tap.mk

…

tap-driver.sh

…

tap-test

…