X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.c;h=fb6aa4a551802de07be76bd838b6f22a236457ff;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=856e98c0837f422f18d57aa4f3ca453120882bca;hpb=fcd91f8de20bf7969599a7a60cba73117d99f2d1;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 856e98c08..fb6aa4a55 100644
--- 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;
 	}