5422b0 Let's be explicit about what we want the merge_status to be

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Let's be explicit about what we want the merge_status to be
    
        
file modified
+1 -1