diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-04-30 02:28:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 00:45:51 +0200 |
| commit | 82247e9bd5f7c90c4eac9674fb7518845cd3e432 (patch) | |
| tree | 09fd8632c7e1ec214968eec58ded00184869646f /ll-merge.c | |
| parent | Merge branch 'ld/git-p4-tags-and-labels' (diff) | |
| download | git-82247e9bd5f7c90c4eac9674fb7518845cd3e432.tar.xz git-82247e9bd5f7c90c4eac9674fb7518845cd3e432.zip | |
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 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index da59738c9b..f3f7692158 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -73,7 +73,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, if (buffer_is_binary(orig->ptr, orig->size) || buffer_is_binary(src1->ptr, src1->size) || buffer_is_binary(src2->ptr, src2->size)) { - warning("Cannot merge binary files: %s (%s vs. %s)\n", + warning("Cannot merge binary files: %s (%s vs. %s)", path, name1, name2); return ll_binary_merge(drv_unused, result, path, |