Commit f8799a55 authored by jkobus's avatar jkobus Committed by Jarek Kobus
Browse files

Changing diff editor's parameters shouldn't switch diff type



Task-number: QTCREATORBUG-10221

Change-Id: I215460b11fa02605151523c8d4439b369fe7c3aa
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent d15c6bba
......@@ -594,7 +594,8 @@ public:
void executeCommand()
{
m_client->diff(m_workingDirectory, m_unstagedFileNames, m_stagedFileNames);
m_client->diff(m_workingDirectory, m_unstagedFileNames, m_stagedFileNames,
GitClient::SimpleTextDiffEditor);
}
private:
......@@ -614,7 +615,7 @@ public:
void executeCommand()
{
m_client->diff(m_workingDirectory, m_fileName);
m_client->diff(m_workingDirectory, m_fileName, GitClient::SimpleTextDiffEditor);
}
private:
......@@ -633,7 +634,8 @@ public:
void executeCommand()
{
m_client->diffBranch(m_workingDirectory, baseArguments(), m_branchName);
m_client->diffBranch(m_workingDirectory, baseArguments(), m_branchName,
GitClient::SimpleTextDiffEditor);
}
private:
......@@ -668,7 +670,8 @@ public:
void executeCommand()
{
m_client->show(m_workingDirectory, m_id, baseArguments());
m_client->show(m_workingDirectory, m_id, baseArguments(), QString(),
GitClient::SimpleTextDiffEditor);
}
private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment