diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 22:53:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 22:53:35 +0200 |
| commit | 2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (patch) | |
| tree | e82c022130c637a6892b11843e5a89178c032908 /unpack-trees.c | |
| parent | Merge branch 'zj/diff-stat-smaller-num-columns' (diff) | |
| parent | remove blank filename in error message (diff) | |
| download | git-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.xz git-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.zip | |
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 '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 1d7393d84c..bcee99c52e 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1793,7 +1793,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 : |