Mercurial > hg > easyhg

changeset 302:6dc0a4dc6cf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another tweak to merge-successful dialog texts
author Chris Cannam
date Tue, 22 Feb 2011 15:53:49 +0000
parents 5e4a10af7945
children bb4702918ba6
files mainwindow.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Tue Feb 22 15:51:47 2011 +0000
+++ b/mainwindow.cpp	Tue Feb 22 15:53:49 2011 +0000
@@ -1985,7 +1985,7 @@
     case ACT_MERGE:
         MoreInformationDialog::information
             (this, tr("Merge"), tr("Merge successful"),
-             tr("The merge succeeded.  Remember to commit the result!"),
+             tr("Remember to test and commit the result before making any further changes."),
              output);
         m_shouldHgStat = true;
         m_justMerged = true;
@@ -1993,7 +1993,7 @@
         
     case ACT_RETRY_MERGE:
         QMessageBox::information(this, tr("Resolved"),
-                                 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.</p>"));
+                                 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.<br>Remember to test and commit the result before making any further changes.</p>"));
         m_shouldHgStat = true;
         m_justMerged = true;
         break;