Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Fetching contributors…

Cannot retrieve contributors at this time

7 lines (6 sloc) 0.248 kb
# git config 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
distro/common/html/* merge=ignore
distro/common/man/man1/* merge=ignore
distro/common/man/man8/* merge=ignore
lib/chef/version.rb merge=ignore
Jump to Line
Something went wrong with that request. Please try again.