Merge branch 'en/d-f-conflict-fix'

diff --git a/.gitignore b/.gitignore
index 1e64a6a138c3659a369e8e2ecadf9a41cc277d9d..4cb14e0baeb325f871d0e48cb03446a5309f92de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -158,7 +158,7 @@
 /gitk-git/gitk-wish
 /gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
-/gitweb/gitweb.min.*
+/gitweb/static/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
@@ -166,6 +166,7 @@
 /test-dump-cache-tree
 /test-genrandom
 /test-index-version
+/test-line-buffer
 /test-match-trees
 /test-obj-pool
 /test-parse-options
@@ -173,6 +174,9 @@
 /test-run-command
 /test-sha1
 /test-sigchain
+/test-string-pool
+/test-svn-fe
+/test-treap
 /common-cmds.h
 *.tar.gz
 *.dsc