Merge branch 'js/fast-import-test-9300'

diff --git a/.gitignore b/.gitignore
index 3b7680ea1e5baa58430798a9836481975dbb6234..1dbeb668dbdcf13ccdbb532e4314c901ae6f7d1c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -92,6 +92,7 @@
 /git-name-rev
 /git-mv
 /git-notes
+/git-p4
 /git-pack-redundant
 /git-pack-objects
 /git-pack-refs
@@ -180,17 +181,16 @@
 /test-index-version
 /test-line-buffer
 /test-match-trees
+/test-mergesort
 /test-mktemp
-/test-obj-pool
 /test-parse-options
 /test-path-utils
+/test-revision-walking
 /test-run-command
 /test-sha1
 /test-sigchain
-/test-string-pool
 /test-subprocess
 /test-svn-fe
-/test-treap
 /common-cmds.h
 *.tar.gz
 *.dsc