comparison mainwindow.cpp @ 302:6dc0a4dc6cf5

Another tweak to merge-successful dialog texts

         break;
         
     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;
         break;
         
     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;
         
     default: