← 6959b313 Applying a branch no longer gets conflicts wrong when stacks are on mixed bases

Passed windows-check 3s

raw log