gitattributes/ObjectiveC.gitattributes

mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 08:18:50 -05:00
# compare .pbxproj files as binary and always merge as union
*.pbxproj binary -merge=union
*.m text diff=objc
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`
Add .m to ObjectiveC 2019-04-17 22:05:37 -04:00			`*.pbxproj binary -merge=union`
			`*.m text diff=objc`