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
77727139ec
gitattributes/ObjectiveC.gitattributes

2 lines
90 B
Plaintext
Raw Normal View History

swap -crlf -diff for binary. update comment string
2014-02-09 14:01:14 -05:00
# compare .pbxproj files as binary and always merge as union
*.pbxproj binary -merge=union
Copy Permalink