diff --git a/.gitignore b/.gitignore
index fbd9b09c5..ab68afcec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@
 /.project
 /.pydevproject
 /.settings
+/unix.tag
+/testresult
+/mergelog
+/mergequeue