diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-09-25 10:34:49 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-09-27 08:54:43 +0200 |
| commit | f8799a558310b7d4907d5baf758c525a2bdf41d1 (patch) | |
| tree | 0387a9fb76790854505fedd25d7cb3e4167a8a4f /src/plugins/git/gitclient.cpp | |
| parent | d15c6bba283602bea9998d9147714a9b7686f7fe (diff) | |
| download | qt-creator-f8799a558310b7d4907d5baf758c525a2bdf41d1.tar.gz | |
Changing diff editor's parameters shouldn't switch diff type
Task-number: QTCREATORBUG-10221
Change-Id: I215460b11fa02605151523c8d4439b369fe7c3aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 9a91cc7491..813539d62a 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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: |