summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* 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