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

history: fix merge dialog

Changeset 3c13ffdc5d9a…

Parent 1cba49bbcf44…

by Steve Borho

Changes to one file · Browse files at 3c13ffdc5d9a Showing diff from parent 1cba49bbcf44 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1375
1376
1377
1378
1379
 
 
1380
1381
1382
 
1375
1376
1377
 
 
1378
1379
1380
1381
1382
@@ -1375,8 +1375,8 @@
  parents = [x.node() for x in self.repo.parents()]   if rev == self.repo.parents()[0].rev():   rev = self.revrange[1] - dialog = merge.MergeDialog(rev) - dialog.set_notify_func(self.merge_completed, parents, len(self.repo)) + dlg = merge.MergeDialog(rev) + dlg.set_notify_func(self.merge_completed, parents, len(self.repo))   self.show_dialog(dlg)     def merge_completed(self, args):