![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:45:12 +0000 (01:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:45:12 +0000 (01:45 -0700) | ||
| commit | e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307 | |
| tree | e0611ad20c9a515a0bd4378749e9b3cac41560e3 | tree | snapshot |
| parent | 792d2370f975f032a708cb35044193b5b5310840 | commit | diff |
| parent | b9905fed7a028cc9749cf8ad479cbb07940c8638 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| diffcore-rename.c | diff1 | | diff2 | | blob | history |