completion: --edit and --no-edit for git-merge

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b7a3f98764cda0e65398694786d4822da2e8f38..3b7680ea1e5baa58430798a9836481975dbb6234 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -175,6 +175,7 @@
 /test-date
 /test-delta
 /test-dump-cache-tree
+/test-scrap-cache-tree
 /test-genrandom
 /test-index-version
 /test-line-buffer