diff -r 95b77e842db3 -r 6b15a094d996 .hgignore
--- a/.hgignore	Mon Sep 09 12:15:54 2013 +0200
+++ b/.hgignore	Mon Oct 14 13:36:28 2013 +0200
@@ -2,3 +2,9 @@
 relre:^build/.*$
 relre:^config.mk$
 relre:DS_Store
+\.orig\..*$
+\.orig$
+\.chg\..*$
+\.rej$
+\.conflict\~$
+^nbproject/.*$