diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:41 -0700 |
| commit | cedeffeee06f7ae5982aa5e08fad78a90c4331bf (patch) | |
| tree | 25529010e1eb7d61322214af3c3ba72cba40f30c /merge-recursive.c | |
| parent | Merge branch 'nd/multiple-work-trees' (diff) | |
| parent | sha1_file: squelch "packfile cannot be accessed" warnings (diff) | |
| download | tgif-cedeffeee06f7ae5982aa5e08fad78a90c4331bf.tar.xz | |
Merge branch 'jk/sha1-file-reduce-useless-warnings'
* jk/sha1-file-reduce-useless-warnings:
sha1_file: squelch "packfile cannot be accessed" warnings
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions