summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 311062a0b3f2a94bb3d6e35caeb5fcbdd095ff69 (plain)
1
2
3
4
# git config merge.ignore.name 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
lib/chef/version.rb merge=ignore
*.reg text eol=crlf