summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-10 13:17:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-10 13:17:30 -0800
commit0538b84027a8aba7e8b805e3ec8fceb3990023e5 (patch)
treee9e2323b28d0eb1c7a3129c07e07d6e2a3c9f08c /t/t3030-merge-recursive.sh
parentMerge branch 'jk/filter-process-fix' (diff)
parentalternates: re-allow relative paths from environment (diff)
downloadtgif-0538b84027a8aba7e8b805e3ec8fceb3990023e5.tar.xz
Merge branch 'jk/alt-odb-cleanup'
Fix a corner-case regression in a topic that graduated during the v2.11 cycle. * jk/alt-odb-cleanup: alternates: re-allow relative paths from environment
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions