diff --git a/builtin/merge.c b/builtin/merge.c index 42fff387e6..a2105ef90c 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 };