summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:59 -0700
commit2c8c407d0a3237a15b4c64249fca50cde4f16115 (patch)
tree3b6863d0296fabbdf2ff4288b22689efc779466e /git-sh-setup.sh
parentMerge branch 'js/pull-rebase-type-shorthand' (diff)
parentt4150: fix broken test for am --scissors (diff)
downloadtgif-2c8c407d0a3237a15b4c64249fca50cde4f16115.tar.xz
Merge branch 'ar/t4150-am-scissors-test-fix'
Test fix. * ar/t4150-am-scissors-test-fix: t4150: fix broken test for am --scissors
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions