diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:29 -0700 |
| commit | 1156097296e584bd05a9feeb14cb9fcf98093dc8 (patch) | |
| tree | 8ab64f854692cef634e05fd2b4ff706c927ffa10 /git-mergetool.sh | |
| parent | Merge branch 'sb/test-bitmap-free-at-end' (diff) | |
| parent | type_from_string_gently: make sure length matches (diff) | |
| download | tgif-1156097296e584bd05a9feeb14cb9fcf98093dc8.tar.xz | |
Merge branch 'jk/type-from-string-gently'
"git cat-file bl $blob" failed to barf even though there is no
object type that is "bl".
* jk/type-from-string-gently:
type_from_string_gently: make sure length matches
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions