summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 06b553db8093147545a556628bebf9b500752af0 (plain)
1
2
ChangeLog    merge=merge-changelog
timezone/* -whitespace