octopus: make merge process simpler to follow
authorStephen Boyd <bebarino@gmail.com>
Sat, 12 Dec 2009 00:38:57 +0000 (16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2009 07:17:46 +0000 (23:17 -0800)
commit8133450...eed1c78f49fc74936b712b3cf32b682a
treee8e6fc5...4f99af01c830fd1b95132674c18b84fdcopy hash to clipboard (tree)
parent9861b64...e045b5ee0e16dea65b44419205090960copy hash to clipboard (diff)
git-merge-octopus.sh
t/t7602-merge-octopus-many.sh