summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Add version.rb files to .gitattributesBryan McLellan2012-12-241-0/+6
| | | | | Ignore these files when merging because they're usually just a change to the version.
* ignore autogenerated content on mergeBryan McLellan2012-01-171-0/+5