Git: Write mergetool input/output to VCS output window

Change-Id: I75fdf1535da610e6300c76a0b11b3ae032899484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

src/plugins/git/mergetool.h

@@ -34,13 +34,14 @@
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
-class QProcess;
 class QMessageBox;
 QT_END_NAMESPACE
 
 namespace Git {
 namespace Internal {
 
+class MergeToolProcess;
+
 class MergeTool : public QObject
 {
     Q_OBJECT
@@ -77,7 +78,7 @@ private:
     void chooseAction();
     void addButton(QMessageBox *msgBox, const QString &text, char key);
 
-    QProcess *m_process;
+    MergeToolProcess *m_process;
     MergeType m_mergeType;
     QString m_fileName;
     FileState m_localState;