Correct error message in revert/cherry-pick
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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
May 10, 2007 at 18:10 UTC
1dcb3b6478cac3d301349c2df4af2e5ec69dfffe
1 file changed
+1
-1
builtin-revert.c
+1
-1
@@ -133,7 +133,7 @@ static void add_to_msg(const char *string)
133
{
134
int len = strlen(string);
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
}
138
139
static void add_message_to_msg(const char *message)