summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:19 -0700
commit2c5c66be6ecdd10f5a88c3548a1494bf9edf483a (patch)
treeaf9ecd6a8aa07c68496f4974793270b7b705f2d9 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'mh/check-ref-format-3' (diff)
parentrefs.c: free duplicate entries in the ref array instead of leaking them (diff)
downloadtgif-2c5c66be6ecdd10f5a88c3548a1494bf9edf483a.tar.xz
Merge branch 'jp/get-ref-dir-unsorted'
* jp/get-ref-dir-unsorted: refs.c: free duplicate entries in the ref array instead of leaking them refs.c: abort ref search if ref array is empty refs.c: ensure struct whose member may be passed to realloc is initialized refs: Use binary search to lookup refs faster Don't sort ref_list too early Conflicts: refs.c
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions