git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jul 2008 20:47:22 +0000 (13:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2008 07:20:51 +0000 (00:20 -0700)
commitc5dc9a2...298afb75d2be6b212d420fc89c258aa0
tree305485d...03d840b7c92bebf0f133101f333f3d66copy hash to clipboard (tree)
parenta7a6692...772ca5e609d283b0b73b8dd446a2a506copy hash to clipboard (diff)
git-merge-octopus.sh