Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ns/merge-recursive-uptodate'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000
(12:08 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000
(12:08 -0700)
* ns/merge-recursive-uptodate:
merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
merge-recursive.c
patch
|
blob
|
history
raw
(from parent 1:
c257bbb
)
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;
}