Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remove blank filename in error message
[gitweb.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index 36523da22aedba160c5a29f95bf339f05dfc6feb..7cfa026b1a554cf915ac6c73b10d3f7f3713930c 100644
(file)
--- 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 :