045feb0 Use the same structure as for the others

Authored and Committed by pingou 8 years ago
    Use the same structure as for the others
    
    First check if we do the merge, if not then return the status
    
        
file modified
+14 -12