merge-recursive: handle D/F conflict case more carefully.

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 4e1d5af634a1280288d7c8110571f1136343bf3e..74a6acacc15b416a6149a519f3a69c5facfa5067 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir, const char *prefix)
 
                if (baselen)
                        path = base = prefix;
-               read_directory(dir, path, base, baselen);
+               read_directory(dir, path, base, baselen, pathspec);
                if (show_others)
                        show_other_files(dir);
                if (show_killed)