diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
| commit | 2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (patch) | |
| tree | e82c022130c637a6892b11843e5a89178c032908 /ll-merge.c | |
| parent | 29c2a3dbadaa1c2d1128a4892241f82f5b34778c (diff) | |
| parent | 5eaeda70de1e7763d070e8ccfbcd8ca10baea800 (diff) | |
| download | git-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.gz git-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.xz | |
Merge branch 'pw/message-cleanup'
Many error/warning messages had extra trailing newlines that are
unnecessary.
By Pete Wyckoff
* pw/message-cleanup:
remove blank filename in error message
remove superfluous newlines in error messages
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 da59738c9..f3f769215 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, |