hackport-0.6.4: cabal/.gitattributes

/Cabal/ChangeLog.md merge=union
/cabal-install/changelog merge=union
/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/script.hs eol=crlf