d4b9dbe Fix unit-tests for the new setting: always_merge

Authored and Committed by pingou 8 years ago
    Fix unit-tests for the new setting: always_merge
    
        
file modified
+1 -0