summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-18 17:58:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-18 17:58:02 -0700
commite41500ac190be71c033aaf57adabeb182c23feed (patch)
tree2f3bf76edbc5b2f8699832f17bcd4f2e5463ce51 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'hn/refs-ref-log-only-bit' (diff)
parentt3200: clean side effect of git checkout --orphan (diff)
downloadtgif-e41500ac190be71c033aaf57adabeb182c23feed.tar.xz
Merge branch 'al/t3200-back-on-a-branch'
Test fix. * al/t3200-back-on-a-branch: t3200: clean side effect of git checkout --orphan
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions