![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Mar 2010 02:30:37 +0000 (19:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Mar 2010 02:30:37 +0000 (19:30 -0700) | ||
| commit | 60dafdd37d7df358b6ff67b317dbe738b50ea6d6 | |
| tree | a7cec8aef124552da5be57b815a69582baf3d8e0 | tree | snapshot |
| parent | c24138bc55bcbbde2ea8601c504752e5a39f53f2 | commit | diff |
| parent | 7325283987430f94712713313c5089e5143f2e17 | commit | diff |
Merge branch 'maint'
* maint:
Documentation/git-read-tree: clarify 2-tree merge
Documentation/git-read-tree: fix table layout
* maint:
Documentation/git-read-tree: clarify 2-tree merge
Documentation/git-read-tree: fix table layout