Skip to content

Preserve merge conflict contents in imported worktrees - #77

Open
wesm wants to merge 13 commits into
mainfrom
fix/merge-driver-conflict-markers
Open

Preserve merge conflict contents in imported worktrees#77
wesm wants to merge 13 commits into
mainfrom
fix/merge-driver-conflict-markers

test(git): cover merge process crashes

449196e
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar