Commit b79449be authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Fix mergetool prompt replies

Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent be25be47
......@@ -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();
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment