Merge branch 'maint-1.5.1' into maint

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)