summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-21 23:10:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-21 23:10:42 -0700
commitc0250b6477d2edf58d0a7bc229bfa4f720c1cd58 (patch)
tree4fbd4c8d180bf95f21722aa77de0e4f350cefe26 /t/t6026-merge-attr.sh
parentMerge branch 'tr/maint-1.6.0-send-email-irt' into maint (diff)
parentMerge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 (diff)
downloadtgif-c0250b6477d2edf58d0a7bc229bfa4f720c1cd58.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions