Merge branch 'tb/crlf-conv-flags' into next

Code clean-up.

* tb/crlf-conv-flags:
convert_to_git(): safe_crlf/checksafe becomes int conv_flags

diff --cc combine-diff.c
Simple merge

diff --cc config.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc environment.c
Simple merge

diff --cc sha1_file.c
Simple merge