Add /merge to gitignore

marijnh · marijnh · commit e78f20dfdafc · 2022-11-10T15:11:18.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ package-lock.json
 /lint
 /autocomplete
 /codemirror
+/merge
 /lang-javascript
 /lang-java
 /lang-json
