Permalink
Fetching contributors…
Cannot retrieve contributors at this time
6 lines (5 sloc) 230 Bytes
# git config merge.ignore.name '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