Merge branch 'pw/add-p-recount' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index 90cbe896c99188130a36a18aa18a57cd080be591..bf4a443e1369c2ef6131e5ac34be30c5a5d5b19f 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -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);