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

Passed clippy-no-default-features 1m09s

raw log