Mercurial > hg > easyhg
comparison mainwindow.cpp @ 38:4c42d3f5065d
Updated merge retry success messagebox.
| author | Jari Korhonen <jtkorhonen@gmail.com> |
|---|---|
| date | Sat, 19 Jun 2010 13:25:52 +0300 |
| parents | 46260ce88b71 |
| children | 42f3cb49373b |
comparison
equal
deleted
inserted
replaced
| 37:46260ce88b71 | 38:4c42d3f5065d |
|---|---|
| 969 shouldHgStat = true; | 969 shouldHgStat = true; |
| 970 justMerged = true; | 970 justMerged = true; |
| 971 break; | 971 break; |
| 972 | 972 |
| 973 case ACT_RETRY_MERGE: | 973 case ACT_RETRY_MERGE: |
| 974 QMessageBox::information(this, "Merge retry", runner -> getStdOut()); | 974 QMessageBox::information(this, tr("Merge retry"), tr("Merge retry successful.")); |
| 975 shouldHgStat = true; | 975 shouldHgStat = true; |
| 976 justMerged = true; | 976 justMerged = true; |
| 977 break; | 977 break; |
| 978 | 978 |
| 979 default: | 979 default: |