Commits

timeless  committed 42dee35

merge: simplify restart merge dialog

  • Participants
  • Parent commits aa114b1
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/merge.py

 
     def cancel(self):
         main = _('Cancel merge and discard changes?')
-        text = _('Discard unfinished local changes and restart merge?')
+        # Does this restart "resolved" files too?
+        text = _('Discard local changes and restart merge?')
         labels = ((QMessageBox.Yes, _('&Discard')),
                   (QMessageBox.No, _('Cancel')))
         if qtlib.QuestionMsgBox(_('Confirm Clean Up'), main, text,