Commits

Angel Ezquerra  committed 61a7ecc

merge: rename Commit and Cancel buttons on "commit page" of wizard (refs #1727)

This clarifies the fact that closing the wizard or clicking the old "Cancel"
button on the Commit page of the merge wizard does not really cancel the merge.
It just avoids the final commit.

This issue was brought up while discussing issue #1727.

  • Participants
  • Parent commits 836607e
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/merge.py

         self.skiplast.setChecked(checked)
         self.layout().addWidget(self.skiplast)
 
+        self.setButtonText(QWizard.CommitButton, _('Commit Now'))
+        # The cancel button does not really "cancel" the merge
+        self.setButtonText(QWizard.CancelButton, _('Commit Later'))
+
     def refresh(self):
         pass