diff --git a/.gitignore b/.gitignore
index d3ee8da4..d89e059b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # It seems that running install.sh causes <filename>~ files in this git repo. They are lockfiles.
 *~
 push.sh
+merge.sh