X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge.c;h=f1c84d759dd44f661fb76741d528e43702dfc901;hb=8e4c4e7dc322bf6a2cf468152ea71eff26ebc034;hp=56a1bb651f89c05178153906192857d34c8061e3;hpb=3880c18336a77b1a37ec88e5a515498c73eb5551;p=git.git

diff --git a/builtin-merge.c b/builtin-merge.c
index 56a1bb651..f1c84d759 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -796,11 +796,6 @@ static int suggest_conflicts(void)
 	return 1;
 }
 
-static const char deprecation_warning[] =
-	"'git merge <msg> HEAD <commit>' is deprecated. Please update\n"
-	"your script to use 'git merge -m <msg> <commit>' instead.\n"
-	"In future versions of git, this syntax will be removed.";
-
 static struct commit *is_old_style_invocation(int argc, const char **argv)
 {
 	struct commit *second_token = NULL;
@@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)
 			die("'%s' is not a commit", argv[1]);
 		if (hashcmp(second_token->object.sha1, head))
 			return NULL;
-		warning(deprecation_warning);
 	}
 	return second_token;
 }