diff --git a/docs/gst/.gitignore b/docs/gst/.gitignore
index b6a6a3ca9d..b4b5f1cd2c 100644
--- a/docs/gst/.gitignore
+++ b/docs/gst/.gitignore
@@ -4,3 +4,7 @@ html
 sgml
 gstreamer.signals
 gstreamer.html
+gstreamer-unused.txt
+gstreamer-decl-list.txt
+gstreamer.args
+
diff --git a/test/.gitignore b/test/.gitignore
index a99922f209..d5f47eed60 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -33,10 +33,8 @@ ac3play
 dvdcat
 fake
 cobin
-<<<<<<< .cvsignore
 videotest
 mp1parse
 aviparse
-=======
-mp1parse
->>>>>>> 1.2
+avi2mpg
+vidcapture