From c212e081a5b93c0722716516b4129a249ae81cc3 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 16 Jan 2013 15:54:23 +0200
Subject: [PATCH] Git: Use configured binary for merge tool
Change-Id: I27fc6f5137db81214a9f0f4cab9a6f8812d275a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/mergetool.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index e9753f8efa..6b3e76ae0f 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -95,8 +95,9 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
}
m_process = new MergeToolProcess(this);
m_process->setWorkingDirectory(workingDirectory);
- VcsBase::VcsBaseOutputWindow::instance()->appendCommand(workingDirectory, QLatin1String("git"), arguments);
- m_process->start(QLatin1String("git"), arguments);
+ const QString binary = client->gitBinaryPath();
+ VcsBase::VcsBaseOutputWindow::instance()->appendCommand(workingDirectory, binary, arguments);
+ m_process->start(binary, arguments);
if (m_process->waitForStarted()) {
connect(m_process, SIGNAL(finished(int)), this, SLOT(done()));
connect(m_process, SIGNAL(readyRead()), this, SLOT(readData()));
--
GitLab