caleb-brown/gitattributes
1
0
Fork 0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00
Code

swap -crlf -diff for binary. update comment string

Browse Source
This commit is contained in:
Adam Tait 2014-02-09 11:01:14 -08:00
parent 93e4252d54
commit 03bada5c26
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ObjectiveC.gitattributes
View File

@ -1 +1,2 @@
*.pbxproj text -crlf -diff -merge=union
# compare .pbxproj files as binary and always merge as union
*.pbxproj binary -merge=union