Skip to content

feat(merge): add conflict_choose_side action to replace merged buffer with one whole side#276

Merged
dlyongemallo merged 1 commit into
mainfrom
263-ours_theirs
Jul 1, 2026
Merged

feat(merge): add conflict_choose_side action to replace merged buffer with one whole side#276
dlyongemallo merged 1 commit into
mainfrom
263-ours_theirs

feat(merge): add `conflict_choose_side` action to replace merged buff…

4ae9604
Select commit
Loading
Failed to load commit list.
Sign in for the full log view

Annotations

1 warning
Type check (LuaLS)
succeeded Jul 1, 2026 in 43s