Merge branch 'jk/commit-buffer-length'

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index a9ab328923db3f2b2c945c479386316333dfcd0a..d38a3b2eb5bf4b0940a2aa4d5c32f02b9f35cc15 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -591,6 +591,12 @@ static int remove_file(struct merge_options *o, int clean,
                        return -1;
        }
        if (update_working_directory) {
+               if (ignore_case) {
+                       struct cache_entry *ce;
+                       ce = cache_file_exists(path, strlen(path), ignore_case);
+                       if (ce && ce_stage(ce) == 0)
+                               return 0;
+               }
                if (remove_path(path))
                        return -1;
        }