Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable filelistview: add tooltips for special merge revision actions

After 2.0, the second parent action should be moved to the fileview so the
status, commit, and manifest tools benefit from it.

Changeset 2ef621df0ce5…

Parent cbb464fb01c1…

by Steve Borho

Changes to one file · Browse files at 2ef621df0ce5 Showing diff from parent cbb464fb01c1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
200
201
202
 
 
203
204
205
206
 
 
207
208
209
 
200
201
202
203
204
205
206
207
208
209
210
211
212
213
@@ -200,10 +200,14 @@
    def createActions(self):   self.actionShowAllMerge = QAction(_('Show All'), self) + self.actionShowAllMerge.setToolTip( + _('Toggle display of all files and the direction they were merged'))   self.actionShowAllMerge.setCheckable(True)   self.actionShowAllMerge.setChecked(False)   self.actionShowAllMerge.setVisible(False)   self.actionSecondParent = QAction(_('Other'), self) + self.actionSecondParent.setToolTip( + _('Toggle display of diffs to second (other) parent'))   self.actionSecondParent.setCheckable(True)   self.actionSecondParent.setChecked(False)   self.actionSecondParent.setVisible(False)