feat(merge): conflict regions + diff3 marker rendering #46


      fangorn/ex_git_objectstore

ref:main

merged

cole.christensen@gmail.com wants to merge feat/diff3-conflict-regions into main

No CI