Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

repowidget: fix merge launch

Changeset cb181dc1be0f…

Parent 4e5dc00e4130…

by Steve Borho

Changes to one file · Browse files at cb181dc1be0f Showing diff from parent 4e5dc00e4130 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
548
549
550
551
 
552
553
554
 
548
549
550
 
551
552
553
554
@@ -548,7 +548,7 @@
  run.manifest(self.repo.ui, repo=self.repo, rev=self.rev)     def mergeWithRevision(self): - dlg = merge.MergeDialog(rev, self.repo, self) + dlg = merge.MergeDialog(self.rev, self.repo, self)   def invalidated():   # This could perhaps be better...   self.repo.incrementBusyCount()