summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)AuthorFilesLines
2012-04-10Merge .gitattributes EOL commit from 5.3.Gustavo André dos Santos Lopes1-0/+150
2012-04-10Disabled EOL conversions on certain testsGustavo André dos Santos Lopes1-0/+149
2012-03-21Use the NEWS merge driver if availableDavid Soria Parra1-1/+1
2012-03-21Always keep the NEWS file from the branch when mergingDavid Soria Parra1-0/+1
2012-03-20Enable $Id$ expansion for files with the $Revision$ keywordDavid Soria Parra1-0/+23