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 08d1a86c2dc3…

Parents 28e82e8c3588…

Parents 1222e64332ec…

by Steve Borho

Changes to 2 files · Browse files at 08d1a86c2dc3 Showing diff from parent 28e82e8c3588 1222e64332ec Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rebase.py Stacked
 
108
109
110
 
 
111
112
113
 
108
109
110
111
112
113
114
115
@@ -108,6 +108,8 @@
  self.cmd.setShowOutput(True)   else:   self.showMessage.emit(_('Checking...')) + self.abortbtn.setEnabled(False) + self.rebasebtn.setEnabled(False)   QTimer.singleShot(0, self.checkStatus)     self.setMinimumWidth(480)
Change 1 of 2 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
73
74
75
 
 
 
76
77
78
 
111
112
113
114
 
115
116
117
 
73
74
75
76
77
78
79
80
81
 
114
115
116
 
117
118
119
120
@@ -73,6 +73,9 @@
  {"about", L"About TortoiseHg",   L"Show About Dialog",   "menuabout.ico", 0}, + {"annotate", L"Annotate Files", + L"Changeset information per file line", + "menublame.ico", 0},   {"vdiff", L"Visual Diff",   L"View changes using GUI diff tool",   "TortoiseMerge.ico", 0}, @@ -111,7 +114,7 @@
 static const char* const RepoFilesMenu =   "commit status vdiff sep"   " add revert rename forget remove sep" - " log sep" + " log annotate sep"   " about"  ;