Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fsmonitor: store fsmonitor bitmap before splitting index
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 1494ffdb828106882053065e3ac8cc383136cf80..182626c02781384733b863b025bcfc5a1978e893 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1927,7
+1927,7
@@
int merge_trees(struct merge_options *o,
}
if (oid_eq(&common->object.oid, &merge->object.oid)) {
- output(o, 0, _("Already up
-to-
date!"));
+ output(o, 0, _("Already up
to
date!"));
*result = head;
return 1;
}