Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tree: e1de0f04c5
Fetching contributors…

Cannot retrieve contributors at this time

12 lines (11 sloc) 0.548 kb
# git config 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
chef/distro/common/html/* merge=ignore
chef/distro/common/man/man1/* merge=ignore
chef/distro/common/man/man8/* merge=ignore
chef/lib/chef/version.rb merge=ignore
chef-solr/lib/chef/solr/version.rb merge=ignore
chef-server/lib/chef-server/version.rb merge=ignore
chef-server-webui/lib/chef-server-webui/version.rb merge=ignore
chef-server-api/lib/chef-server-api/version.rb merge=ignore
chef-expander/lib/chef/expander/version.rb merge=ignore
Jump to Line
Something went wrong with that request. Please try again.