From 376a90e028c82577ac084974e98465934bbc6866 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Fri, 5 Apr 2013 18:33:10 +0200
Subject: [PATCH] Added second button to message box

Change-Id: I59ec1c5000afcdd2c91ed55c32aaae11b95b620a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/mergetool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index c44bbfe4f97..88bde7e96c6 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -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");