From b79449beddfc8c005c7bab6febdab2162827e735 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 3 Jun 2014 12:07:56 +0300
Subject: [PATCH] Git: Fix mergetool prompt replies

Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/mergetool.cpp | 2 ++
 1 file changed, 2 insertions(+)

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();
         }
     }
 }