summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:19 -0700
commitfb1c85d2e9777f620ba39e4c2552873bfb4b47f0 (patch)
tree537433d28a0740c744187f1cb992f3d3d8e5723c /merge-recursive.c
parentMerge branch 'rs/pickaxe-simplify' (diff)
parentremote-http: use argv-array (diff)
downloadtgif-fb1c85d2e9777f620ba39e4c2552873bfb4b47f0.tar.xz
Merge branch 'jc/remote-http-argv-array'
* jc/remote-http-argv-array: remote-http: use argv-array
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions