Merge branch 'js/rebase-deprecate-preserve-merges'

diff --git a/.gitignore b/.gitignore
index 44c74402c8c6dedfa24a9f5da6c596c7153b9d25..2374f77a1aae580ed4f71d14e1383bd2dabebd27 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -135,7 +135,6 @@
 /git-remote-ftps
 /git-remote-fd
 /git-remote-ext
-/git-remote-testgit
 /git-remote-testpy
 /git-remote-testsvn
 /git-repack