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.

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}