summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2012-02-20 14:46:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-23 10:43:44 +0100
commit212204b4fff05aed43a931e71855948ec9910b59 (patch)
tree126dcaa4b5eb71ada912ff12bb19edbb744f93ea /.gitattributes
parent7e76d66f526de98804f01771ca0fea1ade7b6677 (diff)
Fix rewrite of multiline string literals.
This commits ensures that we don't rewrite `\'-terminated multiline string literals. Also, it fixes the processing of \r characters inside the string literals. Change-Id: If3d7c1b83c7306b9ccb1be31412b6f8e76434c41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index a3c6108370..157176bdb8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
.tag ident
+*_crlf.* eol=crlf