Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge: remove unused method

Changeset 520dbe50840b…

Parent 872a35fa6438…

by Yuki KODAMA

Changes to one file · Browse files at 520dbe50840b Showing diff from parent 872a35fa6438 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
175
176
177
178
179
180
181
182
183
184
185
 
175
176
177
 
 
 
 
 
178
179
180
@@ -175,11 +175,6 @@
  self.cmd.set_property('visible', working)   self.abortbtn.set_property('visible', working)   - def cmd_done(self, returncode): - self.switch_to(MODE_NORMAL, cmd=False) - if returncode == 0 and not self.cmd.is_show_log(): - self.response(gtk.RESPONSE_CLOSE) -   def domerge(self):   cmdline = ['hg', 'merge', '--rev', self.otherrev]   tool = hglib.fromutf(self.mergetool.child.get_text())