Skip to content

Restore the three-way merge editor behind an opt-in setting - #7

Merged
boyan01 merged 1 commit into
boyan01:mainfrom
tranphucbol:feature/restore-merge-editor
Oct 20, 2026
Merged

boyan01 merged 1 commit into
boyan01:mainfrom
tranphucbol:feature/restore-merge-editor

Revert "Remove the experimental three-way merge editor"

1da5188
Select commit
Loading
Failed to load commit list.
Sign in for the full log view

Annotations

2 notices
Format, lint and types
succeeded Oct 19, 2026 in 1m 0s