X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.c;h=206c1036359ce7b1fc5a1f5734b2d0bc2a760d90;hb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;hp=917397ca7a0c3a702681e1c3e93eb385bb6f28fb;hpb=443f26cbcac66368eb0ec8a8a250bf5815ad0a10;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 917397ca7..206c10363 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -409,7 +409,7 @@ static int remove_file(struct merge_options *o, int clean,
 			return -1;
 	}
 	if (update_working_directory) {
-		if (remove_path(path) && errno != ENOENT)
+		if (remove_path(path))
 			return -1;
 	}
 	return 0;