X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.gitattributes;h=602676c977b46b519deac27954e6ca767215060b;hb=bf489feef11f365f8bd911bf4491d207d04ca46f;hp=7497ee17687d649d6814c75f97924551315bea70;hpb=d61150984242938ca836f3a0ea129d946bfc58ec;p=platform%2Fupstream%2Fopencv.git

diff --git a/.gitattributes b/.gitattributes
index 7497ee1..602676c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,6 +31,8 @@
 *.py           text
 *.qrc          text
 *.qss          text
+*.rc           text
+*.rc.in        text
 *.S            text
 *.sbt          text
 *.scala        text
@@ -41,6 +43,8 @@
 
 # reST underlines/overlines can look like conflict markers
 *.rst          text conflict-marker-size=80
+# Markdown heading markers can look like conflict markers
+*.md           text conflict-marker-size=200
 
 *.cmake         text whitespace=tabwidth=2
 *.cmakein       text whitespace=tabwidth=2
@@ -77,6 +81,8 @@ org.eclipse.jdt.core.prefs -text whitespace=cr-at-eol merge=union
 *.cmd       text eol=crlf
 *.cmd.tmpl  text eol=crlf
 *.dsp       text eol=crlf -whitespace
+*.ps1       text eol=crlf
+*.ps1.in    text eol=crlf
 *.sln       text eol=crlf -whitespace
 *.vcproj    text eol=crlf -whitespace merge=union
 *.vcxproj   text eol=crlf -whitespace merge=union