ccc85e If a project's settings always_merge is True, always do a merge commit

Authored and Committed by Pierre-Yves Chibon 8 years ago
    If a project's settings always_merge is True, always do a merge commit
    
        
file modified
+20 -5