diff --git a/merge-recursive.c b/merge-recursive.c
index 7472d3ecc9b8412a697a64c1307259a104e0abf9..a0c804c8171d021780680f11901680d4c7e89e0b 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
#include "string-list.h"
#include "xdiff-interface.h"
#include "ll-merge.h"
-#include "interpolate.h"
#include "attr.h"
#include "merge-recursive.h"
#include "dir.h"
char *lnk = xmemdupz(buf, size);
safe_create_leading_directories_const(path);
unlink(path);
- symlink(lnk, path);
+ if (symlink(lnk, path))
+ die("failed to symlink %s: %s", path, strerror(errno));
free(lnk);
} else
die("do not know what to do with %06o %s '%s'",