Commit 376a90e0 authored by Robert Loehning's avatar Robert Loehning
Browse files

Added second button to message box



Change-Id: I59ec1c5000afcdd2c91ed55c32aaae11b95b620a
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent b8acad53
......@@ -246,7 +246,7 @@ void MergeTool::readData()
} else if (m_merging && line.startsWith("Continue merging")) {
if (QMessageBox::question(0, tr("Continue Merging"),
tr("Continue merging other unresolved paths?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
m_process->write("y\n");
} else {
m_process->write("n\n");
......
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