Skip to content

Commit

Permalink
Correct error message in revert/cherry-pick
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shawn O. Pearce authored and Junio C Hamano committed May 10, 2007
1 parent 2b93bfa commit 1dcb3b6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin-revert.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1dcb3b6

Please sign in to comment.