v1.8.6 - conflict DolDoc view and merge UX
hgit conflictdoc (DolDoc view of in-progress conflicts: text lines / binary / directory / absent, resolution suggested not chosen), MERGE_AUTO lines for auto-merged files, stable conflict indices across resolve. Verified on real QEMU (probe 124).