diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-04-29 20:28:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 15:45:51 -0700 |
| commit | 82247e9bd5f7c90c4eac9674fb7518845cd3e432 (patch) | |
| tree | 09fd8632c7e1ec214968eec58ded00184869646f /unpack-trees.c | |
| parent | 9768cafe681a7844d5a1d067991053b25db83bbb (diff) | |
| download | git-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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 36523da22..7cfa026b1 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1792,7 +1792,7 @@ int bind_merge(struct cache_entry **src, struct cache_entry *a = src[1]; if (o->merge_size != 1) - return error("Cannot do a bind merge of %d trees\n", + return error("Cannot do a bind merge of %d trees", o->merge_size); if (a && old) return o->gently ? -1 : |