98d023 Fix the tests for the addition of disable_non_fast-forward_merges

Authored and Committed by Pierre-Yves Chibon 6 years ago
    Fix the tests for the addition of disable_non_fast-forward_merges
    
    Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>
    
        
file modified
+4 -2
file modified
+2 -1
file modified
+3 -1