Commits

Chad Burrus committed f7e85cf Merge

merge

Comments (0)

Files changed (1)

 [ui]
 username=chadburrus
 #merge=kompare
-#ignore=~/.hgignore-global
+ignore=~/.hgignore-global
 
 [merge-tools]
 #vimdiff.executable = gvim