v1.8.4 - conflict lifecycle completion
resolve to deletion (delete-vs-edit), conflicts shows base/ours/theirs evidence, resolution provenance in the merge commit message. Verified on real QEMU (probe 122).
resolve to deletion (delete-vs-edit), conflicts shows base/ours/theirs evidence, resolution provenance in the merge commit message. Verified on real QEMU (probe 122).