comparison src/mainwindow.cpp @ 378:ad2e56d1e4c4

Reset merge-commit comment when merge fails; add missing ampersand from Help menu label

     case ACT_RETRY_MERGE:
         MoreInformationDialog::information
             (this, tr("Merge"), tr("Merge failed"),
              tr("Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu."),
              output);
+        m_mergeCommitComment = "";
         return;
     case ACT_STAT:
         break; // go on to default report
     default:
         break;

     m_advancedMenu = menuBar()->addMenu(tr("&Advanced"));
     m_advancedMenu->addAction(m_hgIgnoreAct);
     m_advancedMenu->addSeparator();
     m_advancedMenu->addAction(m_hgServeAct);
 
-    m_helpMenu = menuBar()->addMenu(tr("Help"));
+    m_helpMenu = menuBar()->addMenu(tr("&Help"));
     m_helpMenu->addAction(m_aboutAct);
 }
 
 void MainWindow::createToolBars()
 {