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

merge: tweak options

Changeset 69994110b0f4…

Parent 4e32e29b8b83…

by Steve Borho

Changes to one file · Browse files at 69994110b0f4 Showing diff from parent 4e32e29b8b83 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
31
32
33
34
 
35
36
37
 
31
32
33
 
34
35
36
37
@@ -31,7 +31,7 @@
    self.setWindowTitle(_('Merge - %s') % self.repo.displayname)   self.setWindowIcon(qtlib.geticon('hg-merge')) - self.setOption(QWizard.HelpButtonOnRight, False) + self.setOption(QWizard.NoBackButtonOnStartPage, True)   self.setOption(QWizard.IndependentPages, True)     # set pages