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: simplify restart merge dialog

Changeset 42dee35e75ff…

Parent aa114b1d244f…

by timeless

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

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
391
392
393
394
 
 
395
396
397
 
391
392
393
 
394
395
396
397
398
@@ -391,7 +391,8 @@
    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,