*.pbxproj merge=union
*.strings text diff