From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jul 2007 08:45:12 +0000 (-0700)
Subject: Merge branch 'jc/diffcore'
X-Git-Tag: v1.5.3-rc0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307;p=git.git

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
---

e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307