Correct error message in revert/cherry-pick

spearce · Junio C Hamano · commit 1dcb3b6478ca · 2007-05-10T15:21:50.000-07:00
We now write to MERGE_MSG, not .msg.  I missed this earlier
when I changed the target we write to.

Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/builtin-revert.c b/builtin-revert.c
@@ -133,7 +133,7 @@ static void add_to_msg(const char *string)
 {
 	int len = strlen(string);
 	if (write_in_full(msg_fd, string, len) < 0)
-		die ("Could not write to .msg");
+		die ("Could not write to MERGE_MSG");
 }
 
 static void add_message_to_msg(const char *message)

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ static void add_to_msg(const char *string)`
`133`	`133`	`{`
`134`	`134`	`int len = strlen(string);`
`135`	`135`	`if (write_in_full(msg_fd, string, len) < 0)`
`136`		`- die ("Could not write to .msg");`
	`136`	`+ die ("Could not write to MERGE_MSG");`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`static void add_message_to_msg(const char *message)`