summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-08-05 10:44:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-05 10:44:39 -0700
commitf5206f1239a2f193aed16bac1c3b8cf71dfbce39 (patch)
tree7b468faed815cf069d7696efb0dc2531c0e460ee /t/t7602-merge-octopus-many.sh
parentMerge git://github.com/git-l10n/git-po (diff)
parentt8001, t8002: fix "blame -L :literal" test on NetBSD (diff)
downloadtgif-f5206f1239a2f193aed16bac1c3b8cf71dfbce39.tar.xz
Merge branch 'es/blame-L-breakage'
* es/blame-L-breakage: t8001, t8002: fix "blame -L :literal" test on NetBSD
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions