-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6b632fd
commit 1eda8f3
Showing
1 changed file
with
49 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
*.doc diff=astextplain | ||
*.DOC diff=astextplain | ||
*.docx diff=astextplain | ||
*.DOCX diff=astextplain | ||
*.dot diff=astextplain | ||
*.DOT diff=astextplain | ||
*.pdf diff=astextplain | ||
*.PDF diff=astextplain | ||
*.rtf diff=astextplain | ||
*.RTF diff=astextplain | ||
|
||
*.jpg binary | ||
*.png binary | ||
*.gif binary | ||
|
||
*.cs -text diff=csharp | ||
*.vb -text | ||
*.c -text | ||
*.cpp -text | ||
*.cxx -text | ||
*.h -text | ||
*.hxx -text | ||
*.py -text | ||
*.rb -text | ||
*.java -text | ||
*.html -text | ||
*.htm -text | ||
*.css -text | ||
*.scss -text | ||
*.sass -text | ||
*.less -text | ||
*.js -text | ||
*.lisp -text | ||
*.clj -text | ||
*.sql -text | ||
*.php -text | ||
*.lua -text | ||
*.m -text | ||
*.asm -text | ||
*.erl -text | ||
*.fs -text | ||
*.fsx -text | ||
*.hs -text | ||
|
||
*.csproj -text merge=union | ||
*.vbproj -text merge=union | ||
*.fsproj -text merge=union | ||
*.dbproj -text merge=union | ||
*.sln -text eol=crlf merge=union |