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

Authored and Committed by pingou 8 years ago
    Let's be explicit about what we want the merge_status to be
    
        
file modified
+1 -1