t6036: fix broken "merge fails but has appropriate contents" tests