builtin-rerere: more carefully find conflict markers