projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b93bfa
)
Correct error message in revert/cherry-pick
author
Shawn O. Pearce
<spearce@spearce.org>
Thu, 10 May 2007 22:10:36 +0000
(18:10 -0400)
committer
Junio 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
patch
|
blob
|
history
diff --git
a/builtin-revert.c
b/builtin-revert.c
index 55d4fa1e6ced9425d8ef4d03d2d238174deba313..ea2f15b977a8b62189755ae89e3ee704b45afae8 100644
(file)
--- 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)