Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

sync: move settings tool link below automerge checkbox

Changeset 13aac2c2f47d…

Parent 355df1492eb5…

by Steve Borho

Changes to one file · Browse files at 13aac2c2f47d Showing diff from parent 355df1492eb5 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
707
708
709
710
711
712
713
714
715
716
717
718
719
 
 
 
 
720
721
722
 
707
708
709
 
 
 
 
710
711
712
713
714
715
716
717
718
719
720
721
722
@@ -707,16 +707,16 @@
  elif repo.postpull == 'rebase':   self.rebase.setChecked(True)   - cfglabel = QLabel(_('<a href="config">Launch settings tool...</a>')) - cfglabel.linkActivated.connect(self.linkactivated) - layout.addWidget(cfglabel) -   self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts '   'where possible'))   self.autoresolve_chk.setChecked(   repo.ui.configbool('tortoisehg', 'autoresolve', False))   layout.addWidget(self.autoresolve_chk)   + cfglabel = QLabel(_('<a href="config">Launch settings tool...</a>')) + cfglabel.linkActivated.connect(self.linkactivated) + layout.addWidget(cfglabel) +   BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Save|BB.Cancel)   bb.accepted.connect(self.accept)