--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Sep 20 19:47:18 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Sep 21 19:11:31 2021 +0200 @@ -1723,14 +1723,14 @@ Private slot used to mark conflicts of the local project as being resolved. """ - self.vcs.hgResolved(self.project.ppath) + self.vcs.vcsResolved(self.project.ppath) def __hgUnresolved(self): """ Private slot used to mark conflicts of the local project as being unresolved. """ - self.vcs.hgResolved(self.project.ppath, unresolve=True) + self.vcs.vcsResolved(self.project.ppath, unresolve=True) def __hgCommitMerge(self): """ @@ -1943,7 +1943,7 @@ """ Private slot used to revert changes made to the local project. """ - shouldReopen = self.vcs.hgRevert(self.project.ppath) + shouldReopen = self.vcs.vcsRevert(self.project.ppath) if shouldReopen: res = EricMessageBox.yesNo( self.parent(),