Skip to content

Don't include common ancestor when picking "both" for a conflict in diff3 style - #5747

Merged
stefanhaller merged 2 commits into
masterfrom
pick-both-with-diff3-conflict-style
Jul 1, 2026
Merged

Don't include common ancestor when picking "both" for a conflict in diff3 style#5747
stefanhaller merged 2 commits into
masterfrom
pick-both-with-diff3-conflict-style

Pick both hunks, not the common ancestor, in diff3 conflicts

ed3f4db
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar