sha1_file: teach sha1_object_info_extended more flags

diff --git a/builtin/merge.c b/builtin/merge.c
index a4a098f40f8e3e61c3f8b730a6b22a83c3c23566..eab03a026d26aaf6b42fb43a363b67857660a763 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -839,9 +839,7 @@ static int suggest_conflicts(void)
        struct strbuf msgbuf = STRBUF_INIT;
 
        filename = git_path_merge_msg();
-       fp = fopen(filename, "a");
-       if (!fp)
-               die_errno(_("Could not open '%s' for writing"), filename);
+       fp = xfopen(filename, "a");
 
        append_conflicts_hint(&msgbuf);
        fputs(msgbuf.buf, fp);