summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:10 -0700
commitf1e80a12a485c1d3092cef96aa4a101405d326f9 (patch)
treeb64e10d20855f734829273c7879b96cc738708dd /t/t7606-merge-custom.sh
parentMerge branch 'lf/sideband-returns-void' (diff)
parentbisect: always call setup_revisions after init_revisions (diff)
downloadtgif-f1e80a12a485c1d3092cef96aa4a101405d326f9.tar.xz
Merge branch 'jk/bisect-show-tree'
"git bisect" makes an internal call to "git diff-tree" when bisection finds the culprit, but this call did not initialize the data structure to pass to the diff-tree API correctly. * jk/bisect-show-tree: bisect: always call setup_revisions after init_revisions
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions