summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Collapse)Author
2011-01-17Rename BUILD_NUMBER to .build_number so it's not so loud.Bharat Mediratta
2011-01-16Specify that we don't want the BUILD_NUMBER changes that happen in other ↵Bharat Mediratta
branches by using a custom merge-keep-ours merge algorithm.