tests: add tests for conflicts while respecting commands.update.check This patch adds tests to check that we don't run into conflicts while respecting commands.update.check. The error message now does not show the hint about --merge option which we should fix.

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