simplify output of conflicting merge

diff --git a/sha1_file.c b/sha1_file.c
index 032300c4c6434701e802df729cd74245e543de20..a07aa4e5c491d16f65bc109673e806e24efb2274 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2301,7 +2301,7 @@ static void close_sha1_file(int fd)
                fsync_or_die(fd, "sha1 file");
        fchmod(fd, 0444);
        if (close(fd) != 0)
-               die("unable to write sha1 file");
+               die("error when closing sha1 file (%s)", strerror(errno));
 }
 
 /* Size of directory component, including the ending '/' */