Elijah Newren <new...@gmail.com> writes: > However, my question here about what to write to the working tree for > a rename/rename(2to1) conflict in one particular corner case still > remains.
Hmph, is it a bad idea to model this after what recursive merge strategy does? I think what is written out from that codepath to the working tree has the nested conflict markers (with a bit of tweak to the marker length, IIRC) in it.
