Merge branch 'jv/merge-nothing-into-void'

diff --git a/.gitignore b/.gitignore
index 1c2f8321386f89ef8c03d11159c97a0f194c4423..5087ce1eb7e2210e7fc25a9a14ac3f499ad5ac2f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -187,6 +187,7 @@
 /test-dump-cache-tree
 /test-dump-split-index
 /test-dump-untracked-cache
+/test-fake-ssh
 /test-scrap-cache-tree
 /test-genrandom
 /test-hashmap