# HG changeset patch
# User Chris Cannam
# Date 1302607311 -3600
# Node ID ad2e56d1e4c4637c57496f1d283258f872b6dcf3
# Parent  4d13cacb3e65a91549e8e68327c3e0c21d60d90d
Reset merge-commit comment when merge fails; add missing ampersand from Help menu label

diff -r 4d13cacb3e65 -r ad2e56d1e4c4 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Mon Mar 28 15:50:50 2011 +0100
+++ b/src/mainwindow.cpp	Tue Apr 12 12:21:51 2011 +0100
@@ -1944,6 +1944,7 @@
             (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
@@ -2755,7 +2756,7 @@
     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);
 }