From: Jared Hance Date: Thu, 10 Feb 2011 23:52:41 GMT Subject: [PATCH v5 1/4] merge: update the usage information to be more modern Message-ID: <1297381964-7137-2-git-send-email-jaredhance@gmail.com> In-Reply-To: <1297381964-7137-1-git-send-email-jaredhance@gmail.com> Apparantly, merge's usage information was outdated and used old terminology. Fix it. Signed-off-by: Jared Hance --- builtin/merge.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 42fff38..439d2c7 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -37,8 +37,8 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - "git merge [options] ...", - "git merge [options] HEAD ", + "git merge [options] ...", + "git merge [options] HEAD ", NULL }; -- 1.7.4