Set dummy merge driver merge ours .gitattributes.
Merge pull request #751 from cirosantilli/attributes-merge-ours-config-driver

Set dummy merge driver merge ours .gitattributes.