kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ns/merge-recursive-uptodate' 

* ns/merge-recursive-uptodate:
  merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
maint
Junio C Hamano 2010-07-15 12:08:11 -07:00
parent c257bbb559 5e5ffa091b
commit a8b7fcffdd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,
}

if (sha_eq(common->object.sha1, merge->object.sha1)) {
output(o, 0, "Already uptodate!");
output(o, 0, "Already up-to-date!");
*result = head;
return 1;
}