Merge branch 'cc/replace-edit'

diff --git a/.gitignore b/.gitignore
index dc600f9b36d09f0668064e044520c7ce633f09d8..81e12c0621d42b495ab540391e1cd8ece18587b7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -165,6 +165,7 @@
 /git-upload-archive
 /git-upload-pack
 /git-var
+/git-verify-commit
 /git-verify-pack
 /git-verify-tag
 /git-web--browse
@@ -180,6 +181,7 @@
 /test-date
 /test-delta
 /test-dump-cache-tree
+/test-dump-split-index
 /test-scrap-cache-tree
 /test-genrandom
 /test-hashmap
@@ -226,6 +228,7 @@
 /config.mak.autogen
 /config.mak.append
 /configure
+/unicode
 /tags
 /TAGS
 /cscope*