Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Sep 21 19:11:31 2021 +0200
@@ -266,7 +266,7 @@
             if itm.data(0, self.StatusRole) == "U"
         ]
         if names:
-            self.vcs.hgResolved(names)
+            self.vcs.vcsResolved(names)
             self.on_refreshButton_clicked()
     
     @pyqtSlot()
@@ -280,7 +280,7 @@
             if itm.data(0, self.StatusRole) == "R"
         ]
         if names:
-            self.vcs.hgResolved(names, unresolve=True)
+            self.vcs.vcsResolved(names, unresolve=True)
             self.on_refreshButton_clicked()
     
     @pyqtSlot()