diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ac90fd9e27..08917314fb 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -419,10 +419,8 @@ static int remove_file(struct merge_options *o, int clean, 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; } |