Skip to content

v1.8.6 - conflict DolDoc view and merge UX

Choose a tag to compare

@VectorSophie VectorSophie released this 20 Sep 00:38
· 24 commits to main since this release

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).