78da9c9 Add mergetools.hgrc patch

Authored and Committed by nbecker 16 years ago
    Add mergetools.hgrc patch
    
        
file modified
+1 -0
file modified
+2 -0
file modified
+1 -0