Merge branch 'jk/unpack-entry-fallback-to-another'

diff --git a/.gitignore b/.gitignore
index 10aee94760bca452935ac5c0dfc337a0f6b58a30..c0e00eb37bb370ce9deee72468fb419bc25cfd62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -191,6 +191,7 @@
 /test-mktemp
 /test-parse-options
 /test-path-utils
+/test-read-cache
 /test-regex
 /test-revision-walking
 /test-run-command
@@ -229,6 +230,7 @@
 /cscope*
 *.obj
 *.lib
+*.res
 *.sln
 *.suo
 *.ncb