Changing gitattributes merge policy for pbproj to see diff