Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
imap-send: Fix sprintf usage
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 856e98c0837f422f18d57aa4f3ca453120882bca..fb6aa4a551802de07be76bd838b6f22a236457ff 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1214,7
+1214,7
@@
int merge_trees(struct merge_options *o,
}
if (sha_eq(common->object.sha1, merge->object.sha1)) {
- output(o, 0, "Already up
to
date!");
+ output(o, 0, "Already up
-to-
date!");
*result = head;
return 1;
}