merge script: handle many-way octopus
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:09:58 +0000 (02:09 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commitd9a680acf68caef16b5f316ed7917d8160d3578a
treef2d8e508422450ed8dc8575d3191c5cc52beb08b
parenteeb70b6769ad484989c8708a85fef112726a35e1
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>
contrib/examples/git-merge.sh