From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 May 2011 22:51:37 +0000 (-0700)
Subject: Merge branch 'vr/merge-base-doc'
X-Git-Tag: v1.7.6-rc0~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9;p=git.git

Merge branch 'vr/merge-base-doc'

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

014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9