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

Passed doctest 2m10s

raw log