From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 10 May 2007 22:10:36 +0000 (-0400)
Subject: Correct error message in revert/cherry-pick
X-Git-Tag: v1.5.2-rc3~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1dcb3b6478cac3d301349c2df4af2e5ec69dfffe;p=git.git

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>
---

diff --git a/builtin-revert.c b/builtin-revert.c
index 55d4fa1e6..ea2f15b97 100644
--- 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)