1. 8bd5710 Re-enable merge-mode config option and add more tests by Adam Gandelman ยท 8 years ago