t6036: criss-cross with weird content can fool git into clean merge