1. 771fd52 Disallow using error-prone merge strategies by Anton Hansson ยท 4 years ago