summaryrefslogtreecommitdiff
path: root/help.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:09:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:05 (GMT)
commitd9a680acf68caef16b5f316ed7917d8160d3578a (patch)
treef2d8e508422450ed8dc8575d3191c5cc52beb08b /help.h
parenteeb70b6769ad484989c8708a85fef112726a35e1 (diff)
downloadgit-d9a680acf68caef16b5f316ed7917d8160d3578a.zip
git-d9a680acf68caef16b5f316ed7917d8160d3578a.tar.gz
git-d9a680acf68caef16b5f316ed7917d8160d3578a.tar.bz2
merge script: handle many-way octopus
Based on v1.6.0-rc0~51^2~5 (Build in merge, 2008-07-07). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'help.h')
0 files changed, 0 insertions, 0 deletions