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

2 lines
90 B
Plaintext

# compare .pbxproj files as binary and always merge as union
*.pbxproj binary -merge=union