Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 7155
- 334c7d0b5036
- parent 7152
- a99df2004bb7
- child 7183
- 4ac1c9daa90b
equal
deleted
inserted
replaced
| 7154:2d90de2056ec | 7155:334c7d0b5036 |
|---|---|
| 423 self.tr('Commit Merge'), | 423 self.tr('Commit Merge'), |
| 424 self.tr('Commit Merge'), | 424 self.tr('Commit Merge'), |
| 425 0, 0, self, 'mercurial_commit_merge') | 425 0, 0, self, 'mercurial_commit_merge') |
| 426 self.hgCommitMergeAct.setStatusTip(self.tr( | 426 self.hgCommitMergeAct.setStatusTip(self.tr( |
| 427 'Commit a merge.' | 427 'Commit a merge.' |
| 428 )) | 428 )) |
| 429 self.hgCommitMergeAct.setWhatsThis(self.tr( | 429 self.hgCommitMergeAct.setWhatsThis(self.tr( |
| 430 """<b>Commit a merge</b>""" | 430 """<b>Commit a merge</b>""" |
| 431 """<p>This commits a merge working directory</p>""" | 431 """<p>This commits a merge working directory</p>""" |
| 432 )) | 432 )) |
| 433 self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) | 433 self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) |
| 434 self.actions.append(self.hgCommitMergeAct) | 434 self.actions.append(self.hgCommitMergeAct) |
| 435 | 435 |
| 436 self.hgAbortMergeAct = E5Action( | 436 self.hgAbortMergeAct = E5Action( |
| 437 self.tr('Abort Merge'), | 437 self.tr('Abort Merge'), |
