remove_dir_recurse(): tighten condition for removing unreadable dir

diff --git a/merge-recursive.c b/merge-recursive.c
index dbb7104c043b14f2a43d67e1ca87ce88f4a55408..021e1fc4532758d8c9577bf493d23a8e23ddc96e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -693,7 +693,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
        /* Make sure leading directories are created */
        status = safe_create_leading_directories_const(path);
        if (status) {
-               if (status == -3) {
+               if (status == SCLD_EXISTS) {
                        /* something else exists */
                        error(msg, path, _(": perhaps a D/F conflict?"));
                        return -1;