diff -r fd3db1e6b7a3 -r 4675d9c6c66b .hgignore
--- a/.hgignore	Wed Jun 06 16:13:44 2012 +0200
+++ b/.hgignore	Tue Jun 12 11:08:27 2012 +0200
@@ -3,4 +3,8 @@
 ^docs/build/
 ^docs/html/
 ^html/
-.pyc$
+\.pyc$
+~$
+\.orig$
+\.rej$
+\.err$