summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:53:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:53:27 -0700
commitc4818faf81d32d940c58ab209f83b6049b33ecbb (patch)
tree2459bc0476c8a1b8d4181c2c7af4c747c910a9ac /t/t7110-reset-merge.sh
parentt/README: clarify test_must_fail description (diff)
parentMerge branch 'maint-1.6.6' into maint-1.7.0 (diff)
downloadtgif-c4818faf81d32d940c58ab209f83b6049b33ecbb.tar.xz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: request-pull.txt: Document -p option Check size of path buffer before writing into it
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions