Remove a redundant errno test in a usage of remove_path

The errno test is redundant because the same test is carried
out in remove_path itself.

Signed-off-by: Peter Collingbourne <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: pcc

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;