Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 917397ca7a0c3a702681e1c3e93eb385bb6f28fb..206c1036359ce7b1fc5a1f5734b2d0bc2a760d90 100644
(file)
--- 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;