Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge

Changeset b71beec349aa…

Parents 55f91e630fef…

Parents 3fe6d1af8397…

by Steve Borho

Changes to 2 files · Browse files at b71beec349aa Showing diff from parent 55f91e630fef 3fe6d1af8397 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
530
531
532
533
 
534
535
536
 
530
531
532
 
533
534
535
536
@@ -530,7 +530,7 @@
  # send this event to the main app   opts = {'pats' : [self.curfile]}   self.glog_parent.custombutton.set_active(True) - self.glog_parent.reload_log(opts) + self.glog_parent.reload_log(**opts)   else:   # Else launch our own GLog instance   from hggtk import history
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
357
358
359
360
 
361
362
363
 
357
358
359
 
360
361
362
363
@@ -357,7 +357,7 @@
  self.merge_diff_text.set_editable(False)   self.merge_diff_text.modify_font(self.difffont)   sel = self.filetree.get_selection() - sel = set_mode(gtk.SELECTION_SINGLE) + sel.set_mode(gtk.SELECTION_SINGLE)   self.treeselid = sel.connect('changed', self.merge_sel_changed)   scroller.add(self.merge_diff_text)   diff_frame.add(scroller)