Fix undefined variable in SpecialMergeHistory

[lhc/web/wiklou.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0351cf5..b1649df 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 .project
 cscope.files
 cscope.out
+*.orig
 ## NetBeans
 nbproject*
 project.index
@@ -41,11 +42,13 @@ sftp-config.json
 
 # Building & testing
 node_modules/
+/tests/phpunit/phpunit.phar
 
 # Composer
 /vendor
 /composer.lock
 /composer.json
+/composer.local.json
 
 # MediaWiki UI documentation
 /docs/kss/static