tests: add --keep-tmp to run-tests.py to debug test environment When set, you can find the working dir of the test run as a uniquely named subdirectory of --tmpdir so you can inspect it.

fetch: make test reproducible, tiny code cleanup

fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.