eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py

changeset 7189
4d22e3cb9827
parent 7183
4ac1c9daa90b
child 7229
53054eb5b15a
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Aug 31 12:18:44 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sat Aug 31 12:21:43 2019 +0200
@@ -1728,7 +1728,7 @@
         """
         Private slot used to commit a merge.
         """
-        self.vcs.vcsCommit(self.project.ppath, 'Merge', merge=True)
+        self.vcs.vcsCommit(self.project.ppath, self.tr('Merge'), merge=True)
     
     def __hgAbortMerge(self):
         """

eric ide

mercurial