diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a (patch) | |
| tree | 176d6a941baafd95b6a71e92f4ae2d077e5c6c95 /git-difftool.perl | |
| parent | 99f45c2a5db46c1397a80b0ab282456006b40cb1 (diff) | |
| parent | c879daa23729547fb28aa7e8783c5e4e619a9e7c (diff) | |
| download | git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.gz git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.xz | |
Merge branch 'nd/hash-object-sanity'
* nd/hash-object-sanity:
Make hash-object more robust against malformed objects
Conflicts:
cache.h
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions