Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 7189
- 4d22e3cb9827
- parent 7183
- 4ac1c9daa90b
- child 7229
- 53054eb5b15a
equal
deleted
inserted
replaced
| 7188:f9c57c6fa7c4 | 7189:4d22e3cb9827 |
|---|---|
| 1726 | 1726 |
| 1727 def __hgCommitMerge(self): | 1727 def __hgCommitMerge(self): |
| 1728 """ | 1728 """ |
| 1729 Private slot used to commit a merge. | 1729 Private slot used to commit a merge. |
| 1730 """ | 1730 """ |
| 1731 self.vcs.vcsCommit(self.project.ppath, 'Merge', merge=True) | 1731 self.vcs.vcsCommit(self.project.ppath, self.tr('Merge'), merge=True) |
| 1732 | 1732 |
| 1733 def __hgAbortMerge(self): | 1733 def __hgAbortMerge(self): |
| 1734 """ | 1734 """ |
| 1735 Private slot used to abort an uncommitted merge. | 1735 Private slot used to abort an uncommitted merge. |
| 1736 """ | 1736 """ |
