summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
commitd5d5295e0ad3a05b85f36462be5835a40b2fb75c (patch)
tree0f9a0bcc0fb6a45ded00b66d9fb0fbd9a499e69f /t/t7605-merge-resolve.sh
parentMerge branch 'sb/git-clang-format' (diff)
parentrun-command: use ALLOC_ARRAY (diff)
downloadtgif-d5d5295e0ad3a05b85f36462be5835a40b2fb75c.tar.xz
Merge branch 'rs/run-command-use-alloc-array'
Code clean-up. * rs/run-command-use-alloc-array: run-command: use ALLOC_ARRAY
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions