aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-04-29 20:28:45 -0400
committerJunio C Hamano <gitster@pobox.com>2012-04-30 15:45:51 -0700
commit82247e9bd5f7c90c4eac9674fb7518845cd3e432 (patch)
tree09fd8632c7e1ec214968eec58ded00184869646f /builtin/merge-file.c
parent9768cafe681a7844d5a1d067991053b25db83bbb (diff)
downloadgit-82247e9bd5f7c90c4eac9674fb7518845cd3e432.tar.gz
git-82247e9bd5f7c90c4eac9674fb7518845cd3e432.tar.xz
remove superfluous newlines in error messages
The error handling routines add a newline. Remove the duplicate ones in error messages. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r--builtin/merge-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 237abd3c0..6f0efef43 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -63,7 +63,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (quiet) {
if (!freopen("/dev/null", "w", stderr))
return error("failed to redirect stderr to /dev/null: "
- "%s\n", strerror(errno));
+ "%s", strerror(errno));
}
if (prefix)
@@ -76,7 +76,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (read_mmfile(mmfs + i, fname))
return -1;
if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
- return error("Cannot merge binary files: %s\n",
+ return error("Cannot merge binary files: %s",
argv[i]);
}