Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

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

Changeset aa114b1d244f…

Parent 7bcff0898ccb…

by timeless

Changes to one file · Browse files at aa114b1d244f Showing diff from parent 7bcff0898ccb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
58
59
60
61
62
 
 
63
64
65
 
58
59
60
 
 
61
62
63
64
65
@@ -58,8 +58,8 @@
  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,