Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable merge: the outputLog widget is a member of cmdui.Core (fixes #617)

Changeset a614b2251210…

Parent e5d11468db9c…

by Steve Borho

Changes to one file · Browse files at a614b2251210 Showing diff from parent e5d11468db9c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
402
403
404
405
 
406
407
408
 
402
403
404
 
405
406
407
408
@@ -402,7 +402,7 @@
  (QMessageBox.No, _('Cancel')))   if qtlib.QuestionMsgBox(_('Confirm Clean Up'), main, text,   labels=labels, parent=self): - o = self.cmd.outputLog + o = self.cmd.core.outputLog   o.appendLog(_('Canceling merge...\n'), 'control')   o.appendLog(_('(Please close any running merge tools)\n'), 'control')   self.cmd.cancel()