From: Shawn O. Pearce Date: Thu, 10 May 2007 22:10:36 GMT Subject: [PATCH] Correct error message in revert/cherry-pick Message-ID: <20070510221036.GA31328@spearce.org> 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 --- builtin-revert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-revert.c b/builtin-revert.c index 55d4fa1..ea2f15b 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) -- 1.5.2.rc2.754.g40686