summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-06-19 16:01:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-19 16:01:51 -0700
commitb93d2ff3aabaedbeb3351a451ab4b7092b2b754c (patch)
treed5b2fdc268544a209834d29cd10595e8cc0e89b4 /git-merge-octopus.sh
parenttests: link shell libraries into valgrind directory (diff)
parentbuiltin/gc.c: add missing newline in message (diff)
downloadtgif-b93d2ff3aabaedbeb3351a451ab4b7092b2b754c.tar.xz
Merge branch 'maint'
* maint: builtin/gc.c: add missing newline in message
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions