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

Passed clippy-all-features 3s

raw log