summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorAlexander Potashev <aspotashev@gmail.com>2009-01-04 21:38:41 +0300
committerJunio C Hamano <gitster@pobox.com>2009-01-05 13:01:01 -0800
commitd75307084da5f89329de190bb9b4a3196cec1d0e (patch)
tree74731a248640431379ceba54fa4e826b85d22eaa /builtin-merge-recursive.c
parente89e2ed7c225cf16cffbd9648895528e471e2fb8 (diff)
downloadgit-d75307084da5f89329de190bb9b4a3196cec1d0e.tar.gz
remove trailing LF in die() messages
LF at the end of format strings given to die() is redundant because die already adds one on its own. Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
-rw-r--r--builtin-merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 6b534c1a66..703045bfc8 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 <base>... -- <head> <remote> ...\n", argv[0]);
+ die("Usage: %s <base>... -- <head> <remote> ...", argv[0]);
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--"))