| author | Dave Peticolas <dave@krondo.com> |
|---|---|
| Wed, 16 Jan 2008 05:16:05 +0000 (21:16 -0800) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 16 Jan 2008 19:37:57 +0000 (11:37 -0800) | |
| commit | b98525e...bf1c3587bc57ad982d616dbe174c6e23 |
| tree | 0f77b06...06e0003d83c5b8ec1b8ed71a28e9cd1a (tree) |
| parent | 6232f62...c77ba9fc57fa97c61a7678a9f243c3bd (diff) |
| Documentation/git-merge.txt | diff | blob | history |