Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase -i --autosquash: auto-squash commits
[gitweb.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index 31c74578f6b82d859e038ddf9ca43d3b5fd9429a..2d6b6d6cb1d2bc2d334bf058feb3444e94b5a781 100644
(file)
--- a/
ll-merge.c
+++ b/
ll-merge.c
@@
-152,7
+152,7
@@
static void create_temp(mmfile_t *src, char *path)
strcpy(path, ".merge_file_XXXXXX");
fd = xmkstemp(path);
if (write_in_full(fd, src->ptr, src->size) != src->size)
- die("unable to write temp-file");
+ die
_errno
("unable to write temp-file");
close(fd);
}