From 2485b7618384d9271fd1ff65954ab01c8c1eb536 Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@digia.com> Date: Wed, 29 May 2013 14:56:18 +0200 Subject: [PATCH] SVN: Always use internal diff command This unbreaks svn diff views for users with custom diff commands set up in their subversion configuration. Task-number: QTCREATORBUG-9303 Change-Id: Ie3a726f08ad39770b63e2432755467df429067f8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> --- src/plugins/subversion/subversionplugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 047210732b0..1565adf1280 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -572,6 +572,7 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet QFileInfo(p.files.front()).fileName() : p.diffName; QStringList args(QLatin1String("diff")); + args.append(QLatin1String("--internal-diff")); args.append(p.arguments); args << p.files; -- GitLab