feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Use correct output style

Browse Source 
Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-11 22:35:49 +03:00
committed by Orgad Shaneh
parent e2aa5b53cf
commit b0d14c79fe
11 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/mergetool.cpp
View File

@@ -265,7 +265,8 @@ void MergeTool::done()
outputWindow->append(tr("Merge tool process finished successully."));
m_gitClient->continueCommandIfNeeded(workingDirectory);
} else {
outputWindow->append(tr("Merge tool process terminated with exit code %1").arg(exitCode));
outputWindow->appendError(tr("Merge tool process terminated with exit code %1")
.arg(exitCode));
}
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
deleteLater();