.gitattributes - delta/ruby-gems/chef.git - github.com: opscode/chef.git

index : delta/ruby-gems/chef.git

github.com: opscode/chef.git

summary refs log tree commit diff

path: root/.gitattributes

blob: f41db8b6c12c5113e3dce48cb7a792bf0785c801 (plain)

1
2
3

# git config merge.ignore.name 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
lib/chef/version.rb merge=ignore