diff --git a/mercurial/merge.py b/mercurial/merge.py index ef1eb6df70714ed097e4fcd7abcf9b4a715ded59_bWVyY3VyaWFsL21lcmdlLnB5..c9223a3979b70ebdfead832942f5862fb24a96a7_bWVyY3VyaWFsL21lcmdlLnB5 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -287,7 +287,7 @@ if entry[0] == 'u': yield f - def resolve(self, dfile, wctx, labels=None): + def _resolve(self, dfile, wctx, labels=None): """rerun merge process for file path `dfile`""" if self[dfile] == 'r': return 0 @@ -323,6 +323,10 @@ self.mark(dfile, 'r') return r + def resolve(self, dfile, wctx, labels=None): + """rerun merge process for file path `dfile`""" + return self._resolve(dfile, wctx, labels=labels) + def _checkunknownfile(repo, wctx, mctx, f, f2=None): if f2 is None: f2 = f