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

Merge with stable

Changeset ea305decebda…

Parents 28f0aba0ee0b…

Parents eab19e4cb3e1…

by Steve Borho

Changes to 3 files · Browse files at ea305decebda Showing diff from parent 28f0aba0ee0b eab19e4cb3e1 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​debugging.txt Stacked
 
62
63
64
65
 
66
67
68
 
62
63
64
 
65
66
67
68
@@ -62,7 +62,7 @@
 repository. You can double-click on this file to load the key into your  registry.   -Another option is to exit the :command:`ThgTaskbar` system tray +Another option is to exit the :command:`TortoiseHgOverlayServer` system tray  application and start it from the command line. It will emit some debug  information to the console.  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
66
67
68
69
 
70
71
72
 
66
67
68
 
69
70
71
72
@@ -66,7 +66,7 @@
  history = QRadioButton(_('All History'))   singlematch = QCheckBox(_('Report only the first match per file'))   follow = QCheckBox(_('Follow copies and renames')) - recurse = QCheckBox(_('Recurse into subrepos')) + recurse = QCheckBox(_('Recurse into subrepositories'))   revle = QLineEdit()   grid = QGridLayout()   grid.addWidget(working, 0, 0)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
1393
1394
1395
1396
 
1397
1398
1399
 
1393
1394
1395
 
1396
1397
1398
1399
@@ -1393,7 +1393,7 @@
  layout.addRow(self.forcecb, None)     self.subrepocb = QCheckBox( - _('Recurse into subrepositories (--subrepos)')) + _('Recurse into subrepositories') + u' (--subrepos)')   self.subrepocb.setChecked(opts.get('subrepos', False))   layout.addRow(self.subrepocb, None)