diff --git a/builtin-revert.c b/builtin-revert.c
index ae0139500a6b4226e8b38b580524c6273f69a8cb..151aa6a981832954120359f7c953015525b530d8 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
OPT_END(),
};
OPT_END(),
};
- if (parse_options(argc, argv, options, usage_str, 0) != 1)
+ if (parse_options(argc, argv, NULL, options, usage_str, 0) != 1)
usage_with_options(usage_str, options);
arg = argv[0];
usage_with_options(usage_str, options);
arg = argv[0];
{
int len = strlen(string);
if (write_in_full(msg_fd, string, len) < 0)
{
int len = strlen(string);
if (write_in_full(msg_fd, string, len) < 0)
- die ("Could not write to MERGE_MSG");
+ die_errno ("Could not write to MERGE_MSG");
}
static void add_message_to_msg(const char *message)
}
static void add_message_to_msg(const char *message)