diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:17 -0700 |
| commit | 1931f6d6ea24ce6c9b5827361400d76acd627953 (patch) | |
| tree | 4ee252d7cd3d2d3d0c704e2621e759dd86cef3af /xdiff/xmerge.c | |
| parent | Merge branch 'fc/send-email-annotate' (diff) | |
| parent | t5004: fix issue with empty archive test and bsdtar (diff) | |
| download | tgif-1931f6d6ea24ce6c9b5827361400d76acd627953.tar.xz | |
Merge branch 'rs/empty-archive'
Implementations of "tar" of BSD descend have found to have trouble
with reading an otherwise empty tar archive with pax headers and
causes an unnecessary test failure.
* rs/empty-archive:
t5004: fix issue with empty archive test and bsdtar
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions