Permalink
Browse files

Added -merge too to .gitattributes

  • Loading branch information...
1 parent 302dd76 commit a6ca983f9392448200394e03d598ec92dd3143d1 @ricardoquesada ricardoquesada committed Feb 24, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitattributes
View
@@ -1,2 +1,2 @@
-*.pbxproj binary
+*.pbxproj binary -merge

0 comments on commit a6ca983

Please sign in to comment.