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

Passed test 8m50s

raw log