![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800) |
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh
Trivial merge