Commits

Steve Borho committed a614b22

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

  • Participants
  • Parent commits e5d1146
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/merge.py

                   (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()