diff -r 346633cd13d6 -r 3781fd782472 .hgignore
--- a/.hgignore	Tue Oct 16 12:42:00 2012 +0200
+++ b/.hgignore	Sun Jan 24 17:00:17 2016 +0100
@@ -1,4 +1,9 @@
-^target/.*
-.*/target/.*
-.*orig$
-.*~
+^target/.*
+.*/target/.*
+.*orig$
+.*~
+\.orig\..*$
+\.orig$
+\.chg\..*$
+\.rej$
+\.conflict\~$