Merge branch 'bc/hash-independent-tests-part-4'
[gitweb.git] / builtin / rm.c
index 2eacda42b4a8fff746e846891fce0107d80efbe1..19ce95a901bcb086fc4a17c793a0c239c5adfcc2 100644 (file)
@@ -273,7 +273,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
        parse_pathspec(&pathspec, 0,
                       PATHSPEC_PREFER_CWD,
                       prefix, argv);
-       refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);
+       refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL);
 
        seen = xcalloc(pathspec.nr, 1);