diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:43 -0700 |
| commit | 3b175fb940ba970a840cbef3e1e354163838d0eb (patch) | |
| tree | 819a9bfbb64b75868e6f0f194303db7535dcaff7 /builtin/merge-tree.c | |
| parent | 6f402a93ce1eb00438c5bcc5f28164d9165ba8b9 (diff) | |
| parent | 6c8afe495b2cb6e2069942d7c006f6660e186690 (diff) | |
| download | git-3b175fb940ba970a840cbef3e1e354163838d0eb.tar.gz git-3b175fb940ba970a840cbef3e1e354163838d0eb.tar.xz | |
Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint
Avoid possible ssize_t to int truncation.
* mh/strbuf-read-file-returns-ssize-t:
strbuf: strbuf_read_file() should return ssize_t
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions