7fbb1b Move all the merge status and text in a main dict and rely on it

Authored and Committed by Pierre-Yves Chibon 10 years ago
    Move all the merge status and text in a main dict and rely on it
    
        
file modified
+33 -16