Mercurial > hg > easyhg

changeset 378:ad2e56d1e4c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reset merge-commit comment when merge fails; add missing ampersand from Help menu label
author Chris Cannam
date Tue, 12 Apr 2011 12:21:51 +0100
parents 4d13cacb3e65
children d2e4bf428cfc
files src/mainwindow.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }