docs: add isolated diff textual conflict resolver plan

This commit is contained in:
Andrey Avtomonov 2026-05-18 00:27:52 +02:00
parent a630174341
commit a6b859b799