Thomas Gummerer <t.gummerer@xxxxxxxxx> writes: > Fair enough. I thought of the technical documentation as something > that doesn't promise users anything, but rather describes how the > internals work right now, which is what this bit of documentation > attempted to write down. That's fine. I'd rather keep it but perhaps add a reminder to tell readers that it works only when the merging of contents that already records with nested conflict markers happen to "cleanly nest". Thanks.
