Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable merge: repo argument is non-conditional

Changeset 269efcdaf30d…

Parent f299df3c02c0…

by Steve Borho

Changes to one file · Browse files at 269efcdaf30d Showing diff from parent f299df3c02c0 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
24
25
26
27
 
28
29
30
 
743
744
745
746
 
 
24
25
26
 
27
28
29
30
 
743
744
745
 
746
@@ -24,7 +24,7 @@
   class MergeDialog(QWizard):   - def __init__(self, other, repo=None, parent=None): + def __init__(self, other, repo, parent):   super(MergeDialog, self).__init__(parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint) @@ -743,4 +743,4 @@
  if not rev and len(pats):   rev = pats[0]   repo = thgrepo.repository(ui, path=paths.find_root()) - return MergeDialog(rev, repo) + return MergeDialog(rev, repo, None)