tests: separate rewinding of merge commits, temporarily drop an error case The error case will come back in the following commit, because it organically fits there without the need of a separate working clone.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t