1. timeless
  2. thg


timeless  committed aa114b1

merge: commit involves changes to <the working-directory>

  • Participants
  • Parent commits 7bcff08
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/merge.py

View file
         page = self.currentPage()
         if hasattr(page, 'need_cleanup') and page.need_cleanup():
             main = _('Do you want to exit?')
-            text = _('To complete merging, you need to commit merged files '
-                     'in working directory.')
+            text = _('To finish merging, you need to commit '
+                     'the working directory.')
             labels = ((QMessageBox.Yes, _('&Exit')),
                       (QMessageBox.No, _('Cancel')))
             if not qtlib.QuestionMsgBox(_('Confirm Exit'), main, text,