summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:09 -0700
commit504c1942a9b9dc6dd440bd18730f55e947dd9ce1 (patch)
tree9599b09ba2f2c6eff544c97557b0c9bf09675e29 /t/t3030-merge-recursive.sh
parentMerge branch 'fc/styles' (diff)
parentt3600: fix broken "choking git rm" test (diff)
downloadtgif-504c1942a9b9dc6dd440bd18730f55e947dd9ce1.tar.xz
Merge branch 'sg/t3600-nul-sha1-fix'
* sg/t3600-nul-sha1-fix: t3600: fix broken "choking git rm" test
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions