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

Passed test-modern-but 50s

raw log