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

Hopefully make it so conflicts in the xcode project files are automatically resolved. 

This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
master
dak180 2012-02-03 18:06:06 -05:00
parent 73ec38c347
commit d9010d186f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@ -1,3 +1,3 @@
*.pbxproj -crlf -merge
*.xcworkspacedata -crlf -merge
*.xcscheme -crlf -merge
*.pbxproj -crlf merge=ours
*.xcworkspacedata -crlf merge=ours
*.xcscheme -crlf merge=ours