]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Correct error message in revert/cherry-pick
authorShawn O. Pearce <spearce@spearce.org>
Thu, 10 May 2007 22:10:36 +0000 (18:10 -0400)
committerJunio C Hamano <junkio@cox.net>
Thu, 10 May 2007 22:21:50 +0000 (15:21 -0700)
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>
builtin-revert.c

index 55d4fa1e6ced9425d8ef4d03d2d238174deba313..ea2f15b977a8b62189755ae89e3ee704b45afae8 100644 (file)
@@ -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)