merge-{recursive,subtree}: use usagef() to print usage

Usage messages (for example, from "git merge-recursive -h") are friendlier when not preceded by "fatal". Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago · 0874f46e71
1 changed files with 1 additions and 1 deletions
--- 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)
				@@ -33,7 +33,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 	}

 	if (argc < 4)
-		die("Usage: %s <base>... -- <head> <remote> ...", argv[0]);
+		usagef("%s <base>... -- <head> <remote> ...", argv[0]);

 	for (i = 1; i < argc; ++i) {
 		if (!strcmp(argv[i], "--"))