Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
warzone2100/.gitattributes

4 lines
78 B
Plaintext
Raw Normal View History

Some times being able to see the diffs for xcode files can be useful; continue treat them as binary for merges though
2010-12-13 17:09:16 -08:00
*.pbxproj -crlf -merge
Make xcworkspacedata and xcscheme treated as binaries for merges.
2011-04-02 13:04:03 -07:00
*.xcworkspacedata -crlf -merge
*.xcscheme -crlf -merge