Click a cell in Ours or Theirs to toggle whether that side changed the value. Where both sides changed it differently, the merge stops and asks.

Concept demo. The merge engine is planned and not built yet; today the repository is the Phase 0 capture harness.