Skip to content

Fall back to diff3 conflict markers in resolve-conflicts - #212

Merged
haacked merged 2 commits into
mainfrom
haacked/resolve-conflicts-diff3-fallback
Sep 16, 2026
Merged

Fall back to diff3 conflict markers in resolve-conflicts#212
haacked merged 2 commits into
mainfrom
haacked/resolve-conflicts-diff3-fallback

Address review findings on the diff3 marker fallback

0d64b2a
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar