summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 18:58:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 18:58:55 -0700
commit7d4e3a72fb2d544b4a7cfd75f8626532d78fd726 (patch)
tree3001d2f6f301f60a06406e6a138ad081bddefaec /t/t6026-merge-attr.sh
parentMerge branch 'db/maint-missing-origin' (diff)
parentread-tree A B C: do not create a bogus index and do not segfault (diff)
downloadtgif-7d4e3a72fb2d544b4a7cfd75f8626532d78fd726.tar.xz
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
* jc/maint-1.6.0-read-tree-overlay: read-tree A B C: do not create a bogus index and do not segfault
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions