summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:29 -0700
commitcd797c7e6b5e5818e08e22c7e244000a07be151c (patch)
tree58acce08582aeb168f070c0e6fa32a42eab5841f /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'tr/packed-object-info-wo-recursion' (diff)
parentglossary: extend "detached HEAD" description (diff)
downloadtgif-cd797c7e6b5e5818e08e22c7e244000a07be151c.tar.xz
Merge branch 'jc/detached-head-doc'
* jc/detached-head-doc: glossary: extend "detached HEAD" description
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions