summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-16 23:30:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-16 23:30:49 -0700
commit584f8975d2d9530a34bd0b936ae774f82fe30fed (patch)
tree0c8d4596155c443737d4b1f0d7994f2e98d2ba17 /t/t6021-merge-criss-cross.sh
parentMerge branch 'js/difftool-builtin' (diff)
downloadtgif-584f8975d2d9530a34bd0b936ae774f82fe30fed.tar.xz
Twelfth batch for 2.13
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions