diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-03-31 16:46:25 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-03-31 16:46:25 +0200 |
commit | 3234737f6f9b73aec0508e6cd9404c4137e10d47 (patch) | |
tree | 4284a6a32df81efc5f1573563b88ca7c31defd3d /src | |
parent | 148e389587c125aa6a2d8de74496c1fbb5b4e0bd (diff) | |
download | qt-creator-3234737f6f9b73aec0508e6cd9404c4137e10d47.tar.gz |
Mimetype detection: Fix a bug in diff/patch-detection.
Give diff a higher priority than C++ (fixes 'apply patch').
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/vcsbase/VCSBase.mimetypes.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/VCSBase.mimetypes.xml b/src/plugins/vcsbase/VCSBase.mimetypes.xml index 73203bfdd8..3b48f22206 100644 --- a/src/plugins/vcsbase/VCSBase.mimetypes.xml +++ b/src/plugins/vcsbase/VCSBase.mimetypes.xml @@ -10,7 +10,7 @@ rule for C++ as we want diffs to take preference when looking at a C++ patch. --> - <magic priority="10"> + <magic priority="60"> <match value="
+++ " type="string" offset="0:10000"/> </magic> </mime-type> |