diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 08917314fb..6bc3eac85c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -19,6 +19,7 @@ #include "interpolate.h" #include "attr.h" #include "merge-recursive.h" +#include "dir.h" static struct tree *shift_tree_object(struct tree *one, struct tree *two) { @@ -392,22 +393,6 @@ static int update_stages(const char *path, struct diff_filespec *o, return 0; } -static int remove_path(const char *name) -{ - char *slash, *dirs; - - if (unlink(name)) - return -1; - dirs = xstrdup(name); - while ((slash = strrchr(name, '/'))) { - *slash = '\0'; - if (rmdir(name) != 0) - break; - } - free(dirs); - return 0; -} - static int remove_file(struct merge_options *o, int clean, const char *path, int no_wd) { |