Merge branch 'vr/merge-base-doc' into maint

* vr/merge-base-doc: Restructure documentation for git-merge-base. Documentation: update to git-merge-base --octopus

Junio C Hamano committed May 16, 2011 at 16:38 UTC 8de43386505b503e25788f75f89802495828e6c0

No changes.