d7c1f34 treecompose: Config git to make merge happy

Authored and Committed by Colin Walters 6 years ago
    treecompose: Config git to make merge happy
    
        
file modified
+2 -0