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 5681789ce8a7…

Parents 9c9ce6453f1e…

Parents b5e680aa4d23…

by Steve Borho

Changes to one file · Browse files at 5681789ce8a7 Showing diff from parent 9c9ce6453f1e b5e680aa4d23 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
60
61
62
 
 
 
 
 
63
64
65
 
60
61
62
63
64
65
66
67
68
69
70
@@ -60,6 +60,11 @@
  if self.currentPage().canExit():   super(MergeDialog, self).reject()   + def done(self, ret): + self.repo.repositoryChanged.disconnect(self.repositoryChanged) + self.repo.configChanged.disconnect(self.configChanged) + super(MergeDialog, self).done(ret) +    class BasePage(QWizardPage):   def __init__(self, repo, parent):