diff --git a/.gitignore b/.gitignore
index fa633cca2..9939c273b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ docs/plugins
 *~
 *.mo
 push.sh
+merge.sh