1. 4da00f6 Move and re-enable test_build_configuration_branch tests by Adam Gandelman · 8 years ago[Renamed from tests/fixtures/config/merge-modes/main.yaml]
  2. 8bd5710 Re-enable merge-mode config option and add more tests by Adam Gandelman · 8 years ago