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

Passed check-features 50s

raw log