git config: reorganize to use parseopt

[git.git] / builtin-merge-recursive.c
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c

index 6b534c1a66bf7a4abbe0f38add7585dee65a6a44..703045bfc84a804f5cf58537117fb17859951f7e 100644 (file)
--- 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 <base>... -- <head> <remote> ...\n", argv[0]);
+               die("Usage: %s <base>... -- <head> <remote> ...", argv[0]);
  
         for (i = 1; i < argc; ++i) {
                 if (!strcmp(argv[i], "--"))