diff -r 631451eecefc -r 506e951fd338 .hgignore
--- a/.hgignore	Sun May 17 20:40:09 2015 +0300
+++ b/.hgignore	Sun May 17 20:42:32 2015 +0300
@@ -5,3 +5,5 @@
 *.pyc
 zandronum*
 cobalt.cfg
+*.orig
+*.rej