1709b95 Adjust unit-tests for the always_merge setting change

Authored and Committed by pingou 8 years ago
    Adjust unit-tests for the always_merge setting change
    
        
file modified
+3 -1