[PATCH for next] insert missing newline in a diagnostic
When merging, I would get a message like this:
error: The following untracked working tree files would be overwritten by merge:
FILE_NAMEPlease move or remove them before you can merge.
This change inserts the newline after FILE_NAME.
Signed-off-by: Jim Meyering <meyering@redhat.com>
---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index aadd48c..e81c995 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1307,7 +1307,7 @@ void set_porcelain_error_msgs(const char **msgs, const char *cmd)
"Updating the following directories would lose untracked files in it:\n%s";
if (advice_commit_before_merge)
- msg = "The following untracked working tree files would be %s by %s:\n%%s"
+ msg = "The following untracked working tree files would be %s by %s:\n%%s\n"
"Please move or remove them before you can %s.";
else
msg = "The following untracked working tree files would be %s by %s:\n%%s";
--
1.7.2.2.510.g7180a
Jim Meyering <jim@meyering.net>