Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable status: improve warning when reverting during a merge

Fixes #447

Changeset b8ea4474d314…

Parent b7d094e79f38…

by Steve Borho

Changes to one file · Browse files at b8ea4474d314 Showing diff from parent b7d094e79f38 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1118
1119
1120
1121
 
 
1122
1123
1124
 
1118
1119
1120
 
1121
1122
1123
1124
1125
@@ -1118,7 +1118,8 @@
  dlg = gdialog.Confirm(_('Confirm Revert'), files, self,   _('Revert files to revision %s?') % revertopts['rev'])   elif self.merging: - resp = gdialog.CustomPrompt(_('Which parent to revert to?'), + resp = gdialog.CustomPrompt( + _('Uncommited merge - please select a parent revision'),   _('Revert file(s) to local or other parent?'),   self, (_('&local'), _('&other')), _('l')).run()   if resp == ord(_('l')):