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

Git: Continue command after failed merge tool attempt

Browse Source 
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-03-27 13:40:32 +02:00
committed by Orgad Shaneh
parent fec491a290
commit 187bb36945
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,11 +265,11 @@ void MergeTool::done()
int exitCode = m_process->exitCode();
if (!exitCode) {
outputWindow->appendMessage(tr("Merge tool process finished successfully."));
m_gitClient->continueCommandIfNeeded(workingDirectory);
} else {
outputWindow->appendError(tr("Merge tool process terminated with exit code %1")
.arg(exitCode));
}
m_gitClient->continueCommandIfNeeded(workingDirectory, exitCode == 0);
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
deleteLater();
}