tests: add test for issue5946 The test case is a copy of the one for 5833. The only difference is that the merge parents are recorded in the opposite order (and that the test is truncated because it fails).

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