Mercurial > hg > easyhg

changeset 38:4c42d3f5065d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated merge retry success messagebox.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 19 Jun 2010 13:25:52 +0300
parents 46260ce88b71
children 3fa4803ecf44
files mainwindow.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Sat Jun 19 13:10:06 2010 +0300
+++ b/mainwindow.cpp	Sat Jun 19 13:25:52 2010 +0300
@@ -971,7 +971,7 @@
                         break;
 
                     case ACT_RETRY_MERGE:
-                        QMessageBox::information(this, "Merge retry", runner -> getStdOut());
+                        QMessageBox::information(this, tr("Merge retry"), tr("Merge retry successful."));
                         shouldHgStat = true;
                         justMerged = true;
                         break;