.gitattributes 52ba1b1cbda0c8d62819ea6aec11fb898f890d82 Justin Palmer justin@activereload.net http://github.com/kballard/gitnub/commit/41e302c39c3ba9a7b59dbf2db20c9959cbe0f30d 41e302c39c3ba9a7b59dbf2db20c9959cbe0f30d 2008-03-12T13:19:07-07:00 2008-03-12T13:19:07-07:00 Add gitattributes to specify merge and diff. Thanks [KirinDave]. 7db87a40f09cb11b7f5479cf74a2a945ead8dfcb Justin Palmer justin@activereload.net