Merge branch 'jc/diffcore'

* jc/diffcore:
diffcore-delta.c: Ignore CR in CRLF for text files
diffcore-delta.c: update the comment on the algorithm.
diffcore_filespec: add is_binary
diffcore_count_changes: pass diffcore_filespec

diff --cc diff.c
Simple merge

diff --cc diffcore-rename.c
Simple merge