Merge branch 'tb/crlf-conv-flags'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:08 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:08 +0000 (13:39 -0800)
Code clean-up.

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

1  2 
combine-diff.c
config.c
diff.c
environment.c
sha1_file.c

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