diff -r fcb452578142 -r acf54d3fa1d1 .hgignore
--- a/.hgignore	Thu Apr 06 17:44:17 2017 +0200
+++ b/.hgignore	Sun Oct 29 13:35:43 2017 +0100
@@ -1,3 +1,8 @@
 syntax: regexp
 ^nbproject/private/
 ^build/
+\.orig\..*$
+\.orig$
+\.chg\..*$
+\.rej$
+\.conflict\~$