summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:15 -0700
commitb342567b2e99ece089554d6b0edef835d93b195b (patch)
tree625c07cf2d0f4ee83eb383957a15b684a05c9f10 /git-merge-octopus.sh
parentMerge branch 'jk/fix-attribute-macro-in-2.5' (diff)
parentstring_list: use string-list API in unsorted_string_list_lookup() (diff)
downloadtgif-b342567b2e99ece089554d6b0edef835d93b195b.tar.xz
Merge branch 'rt/string-list-lookup-cleanup'
Code cleanup. * rt/string-list-lookup-cleanup: string_list: use string-list API in unsorted_string_list_lookup()
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions