diff -r 1a2d7298bc82 -r fa9bda32de17 .hgignore
--- a/.hgignore	Tue Oct 02 10:49:25 2012 +0200
+++ b/.hgignore	Fri Dec 28 15:44:28 2012 +0100
@@ -1,3 +1,8 @@
 syntax: regexp
 ^build/.*$
 
+\.orig\..*$
+\.orig$
+\.chg\..*$
+\.rej$
+\.conflict\~$