Merge branch 'cc/merge-base-many'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 06:41:38 +0000 (23:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 06:41:38 +0000 (23:41 -0700)
* cc/merge-base-many:
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
merge-base-many: add trivial tests based on the documentation
documentation: merge-base: explain "git merge-base" with more than 2 args
merge-base: teach "git merge-base" to drive underlying merge_bases_many()

Trivial merge