From c395c25b8642893dd1bb4be1fd124dd12f9b848c Mon Sep 17 00:00:00 2001 From: Jared Hance Date: Thu, 10 Feb 2011 18:52:41 -0500 Subject: [PATCH] merge: match the help text with the documentation We used to be very casual in terminology and used , and more or less interchangeably with . Match the help text given by "git merge -h" with that of the documentation. Signed-off-by: Jared Hance Signed-off-by: Junio C Hamano --- builtin/merge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 42fff387e..a2105ef90 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -37,8 +37,9 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - "git merge [options] ...", - "git merge [options] HEAD ", + "git merge [options] ...", + "git merge [options] HEAD ", + "git merge --abort", NULL }; -- 2.30.2