diff mercurial/merge.py @ 23319:3177d710630d

merge: drop underscore prefix from _checkunknown()

The method has been called from commands.py since 3eab42088be4
(update: just merge unknown file collisions, 2012-02-09), so drop the
underscore prefix that suggests that it's private.

--- a/mercurial/merge.py	Wed Nov 12 14:47:48 2014 +0000
+++ b/mercurial/merge.py	Thu Nov 13 23:12:15 2014 -0800
@@ -304,7 +304,7 @@
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f].cmp(wctx[f]))
 
-def _checkunknown(repo, wctx, mctx):
+def checkunknown(repo, wctx, mctx):
     "check for collisions between unknown files and files in mctx"
 
     error = False