summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-06 21:22:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-06 21:22:22 -0800
commit5ae0f68160a189fafc2cf50b9a35aacc73cf8209 (patch)
tree7f620020721d18e07a8505d1aac8913bf110d550 /t/t7110-reset-merge.sh
parentMerge branch 'sn/http-auth-with-netrc-fix' (diff)
parentt/t7508-status.sh: use test_i18ncmp (diff)
downloadtgif-5ae0f68160a189fafc2cf50b9a35aacc73cf8209.tar.xz
Merge branch 'ab/i18n-test-fix'
* ab/i18n-test-fix: t/t7508-status.sh: use test_i18ncmp t/t6030-bisect-porcelain.sh: use test_i18ngrep
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions