Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

merge: remove redundant page title change

Changeset cff83b6292d8…

Parent 29aa68cd530d…

by Steve Borho

Changes to one file · Browse files at cff83b6292d8 Showing diff from parent 29aa68cd530d Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
109
110
111
112
 
113
114
115
 
214
215
216
217
218
219
220
 
109
110
111
 
112
113
114
115
 
214
215
216
 
217
218
219
@@ -109,7 +109,7 @@
  def initializePage(self):   if self.layout():   return - self.setTitle(_('Preparation')) + self.setTitle(_('Prepare to merge'))   self.setSubTitle(_('Verify merge targets and ensure your working '   'directory is clean.'))   self.setLayout(QVBoxLayout()) @@ -214,7 +214,6 @@
  self.layout().addWidget(autoresolve_chk)   self.autoresolve_chk = autoresolve_chk   - self.setTitle(_('Merge another revision to the working directory'))   self.groups.set_visible(False, 'dirty')   self.groups.set_visible(False, 'merged')   self.toggleShowOptions(self.expander.is_expanded())