Merge branch 'ns/merge-recursive-uptodate'

* ns/merge-recursive-uptodate: merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
git-mirror · Jul 15, 2010 · a8b7fcf · a8b7fcf
2 parents c257bbb + 5e5ffa0
commit a8b7fcf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 uptodate!");
+		output(o, 0, "Already up-to-date!");
 		*result = head;
 		return 1;
 	}