X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=81c02ad0531e98379d8cd11dc7c2d70214d67fb4;hb=df217ed6430efe444a09fffdafd39720ae3f9864;hp=fa2ca5250c75a0d335570a3a3c71b20ebd0b42fa;hpb=e89b991a7fe7e400d96bd69272bf6c9dbade4d2c;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index fa2ca5250..81c02ad05 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -219,7 +219,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 	close(fd);
  bad:
 	for (i = 0; i < 3; i++)
-		unlink(temp[i]);
+		unlink_or_warn(temp[i]);
 	strbuf_release(&cmd);
 	return status;
 }