diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 10cc502d685..5df7b3e32b3 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -225,6 +225,7 @@ void MergeTool::chooseAction() ba.append(key.toChar().toLatin1()); ba.append('\n'); m_process->write(ba); + m_process->waitForBytesWritten(); } void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key) @@ -254,6 +255,7 @@ void MergeTool::readData() } else { m_process->write("n\n"); } + m_process->waitForBytesWritten(); } } }