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

Passed test 3m40s

raw log