From: Jonathan Nieder Date: Mon, 09 Nov 2009 15:05:03 GMT Subject: [PATCH 23/24] merge-{recursive,subtree}: use usage() to print usage Message-ID: <1257779104-23884-23-git-send-email-jrnieder@gmail.com> In-Reply-To: <20091109150235.GA23871@progeny.tock> Usage messages (for example, from "git merge-recursive -h") are friendlier when not preceded by "fatal". Signed-off-by: Jonathan Nieder --- builtin-merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index d26a96e..add5900 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -33,7 +33,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) } if (argc < 4) - die("Usage: %s ... -- ...", argv[0]); + usage("%s ... -- ...", argv[0]); for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--")) -- 1.6.5.2