summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-28 15:26:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-28 15:34:28 -0700
commit24358560c3c0ab51c9ef8178d99f46711716f6c0 (patch)
tree6086fdca9d31a0ea384730a7453047f15c589cd9 /git-merge-octopus.sh
parentSync with 2.4.10 (diff)
downloadtgif-24358560c3c0ab51c9ef8178d99f46711716f6c0.tar.xz
Git 2.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions