From acb611c8cf28ff5bb14c95daea46dad2819b7a26 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 17 Jun 2018 15:20:01 +0300
Subject: [PATCH] Git: Show also stderr on Mergetool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I06507b1bb8d3d83a09a746a6b5ba75def859dc6c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/git/mergetool.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 2abba3e01fc..511a762acf4 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -60,6 +60,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
     m_process = new QProcess(this);
     m_process->setWorkingDirectory(workingDirectory);
     m_process->setProcessEnvironment(env);
+    m_process->setReadChannelMode(QProcess::MergedChannels);
     const Utils::FileName binary = GitPlugin::client()->vcsBinary();
     VcsOutputWindow::appendCommand(workingDirectory, binary, arguments);
     m_process->start(binary.toString(), arguments);