Skip to content

conflict support 4 - harden text conflict state transitions#5

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

conflict support 4 - harden text conflict state transitions#5
polyphilz merged 2 commits into
mainfrom
polyphilz/3-pane-3.25

trigger ci again

b832930
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar