Merge branch 'master' into next
commit960ece0e784e9392d8be0c804acc7385ddb9f398
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Mar 2010 02:30:42 +0000 (16 19:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Mar 2010 02:30:42 +0000 (16 19:30 -0700)
tree45bec75bdad8cc802b1f939c93adb8dae49f6870
parent376027b7b612ae127c1a5fcae355685d73176174
parent60dafdd37d7df358b6ff67b317dbe738b50ea6d6
Merge branch 'master' into next

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