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

Passed test-modern-but 28s

raw log