1.1 --- a/.hgignore Thu Apr 06 17:44:17 2017 +0200
1.2 +++ b/.hgignore Sun Oct 29 13:35:43 2017 +0100
1.3 @@ -1,3 +1,8 @@
1.4 syntax: regexp
1.5 ^nbproject/private/
1.6 ^build/
1.7 +\.orig\..*$
1.8 +\.orig$
1.9 +\.chg\..*$
1.10 +\.rej$
1.11 +\.conflict\~$