bdf898 upstream dropped mergetools.rc

Authored and Committed by nbecker 4 years ago
    upstream dropped mergetools.rc
    
        
file modified
+4 -3