Oops, bug, fixed
Early-aborting merging in case of time-out

Thanks to Martin Maurer who reported this issue

Fixes #71