From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Mar 2010 02:30:37 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60dafdd37d7df358b6ff67b317dbe738b50ea6d6;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Documentation/git-read-tree: clarify 2-tree merge
  Documentation/git-read-tree: fix table layout
---

60dafdd37d7df358b6ff67b317dbe738b50ea6d6