| commit | b98525e4bf1c3587bc57ad982d616dbe174c6e23 | |
| author | Dave Peticolas <dave@krondo.com> | |
| Wed, 16 Jan 2008 05:16:05 +0000 (15 21:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jan 2008 19:37:57 +0000 (16 11:37 -0800) | ||
| tree | 0f77b06306e0003d83c5b8ec1b8ed71a28e9cd1a | treesnapshot (tar.gz zip) |
| parent | 6232f62bc77ba9fc57fa97c61a7678a9f243c3bd | commitdiff |
Documentation: fix and clarify grammar in git-merge docs.
Signed-off-by: Dave Peticolas <dave@krondo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Dave Peticolas <dave@krondo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diffblobblamehistory |