summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:49:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:49:17 -0700
commit1931f6d6ea24ce6c9b5827361400d76acd627953 (patch)
tree4ee252d7cd3d2d3d0c704e2621e759dd86cef3af /mergetools/gvimdiff
parentMerge branch 'fc/send-email-annotate' (diff)
parentt5004: fix issue with empty archive test and bsdtar (diff)
downloadtgif-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 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions