forked from qt-creator/qt-creator
Fix some strings.
Change-Id: Iaac415d25ebfac507df73fc4b3977425df521979 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
@@ -264,7 +264,7 @@ void MergeTool::done()
|
||||
const QString workingDirectory = m_process->workingDirectory();
|
||||
int exitCode = m_process->exitCode();
|
||||
if (!exitCode) {
|
||||
outputWindow->appendMessage(tr("Merge tool process finished successully."));
|
||||
outputWindow->appendMessage(tr("Merge tool process finished successfully."));
|
||||
m_gitClient->continueCommandIfNeeded(workingDirectory);
|
||||
} else {
|
||||
outputWindow->appendError(tr("Merge tool process terminated with exit code %1")
|
||||
|
||||
Reference in New Issue
Block a user