Skip to content

conflict support 3 - add merge-editor conflict actions, stateful result rendering and reopen-safe persistence#4

Merged
polyphilz merged 2 commits into
mainfrom
polyphilz/3-pane-3
Apr 27, 2026
Merged

conflict support 3 - add merge-editor conflict actions, stateful result rendering and reopen-safe persistence#4
polyphilz merged 2 commits into
mainfrom
polyphilz/3-pane-3

trigger ci again

ce9fdcd
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar