Merge branch 'jc/diffcore'
commite1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:12 +0000 (2 01:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:12 +0000 (2 01:45 -0700)
treee0611ad20c9a515a0bd4378749e9b3cac41560e3
parent792d2370f975f032a708cb35044193b5b5310840
parentb9905fed7a028cc9749cf8ad479cbb07940c8638
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.c
diffcore-rename.c