summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-10 22:10:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-10 22:21:50 (GMT)
commit1dcb3b6478cac3d301349c2df4af2e5ec69dfffe (patch)
treefd82f08d165dde7482353fdc6ee2c322162ac9d7
parent2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5 (diff)
downloadgit-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.zip
git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.gz
git-1dcb3b6478cac3d301349c2df4af2e5ec69dfffe.tar.bz2
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>
-rw-r--r--builtin-revert.c2
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)