refactor: deepen conflict History alignment ownership

2026-10-16 17:07:28 +02:00
parent 53c37e6209
commit a1fdc1e1b0
5 changed files with 250 additions and 153 deletions
@@ -29,6 +29,9 @@ The full command name of a command-capable core action, without its `core.` pref
 **Command alias**:
 A shorthand spelling of a canonical Ex command, such as `q` for `quit`. An alias refers to the same action, not a separate command implementation.

+**Conflict History**:
+A read-only comparison of selected original conflict inputs against a shared base, separate from the editable resolution Draft.
+
 ## Configuration interfaces

 - Prefer typed objects for editor-owned actions, modes, and other closed sets. Expose new core binding targets through `config.core` rather than requiring command-name strings.