diff options
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 43e55bf90..f628a6275 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -444,10 +444,8 @@ static int remove_file(int clean, const char *path, int no_wd) return -1; } if (update_working_directory) { - unlink(path); - if (errno != ENOENT || errno != EISDIR) + if (remove_path(path) && errno != ENOENT) return -1; - remove_path(path); } return 0; } |