summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* Merge .gitattributes EOL commit from 5.3.Gustavo André dos Santos Lopes2012-04-101-0/+150
|\
| * Disabled EOL conversions on certain testsGustavo André dos Santos Lopes2012-04-101-0/+149
|/
* Use the NEWS merge driver if availableDavid Soria Parra2012-03-211-1/+1
* Always keep the NEWS file from the branch when mergingDavid Soria Parra2012-03-211-0/+1
* Enable $Id$ expansion for files with the $Revision$ keywordDavid Soria Parra2012-03-201-0/+23