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