Documentation: fix and clarify grammar in git-merge docs.
authorDave Peticolas <dave@krondo.com>
Wed, 16 Jan 2008 05:16:05 +0000 (21:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jan 2008 19:37:57 +0000 (11:37 -0800)
commitb98525e4bf1c3587bc57ad982d616dbe174c6e23
tree0f77b06306e0003d83c5b8ec1b8ed71a28e9cd1a
parent6232f62bc77ba9fc57fa97c61a7678a9f243c3bd
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>
Documentation/git-merge.txt