1.1 --- a/.hgignore Tue Oct 02 10:49:25 2012 +0200 1.2 +++ b/.hgignore Fri Dec 28 15:44:28 2012 +0100 1.3 @@ -1,3 +1,8 @@ 1.4 syntax: regexp 1.5 ^build/.*$ 1.6 1.7 +\.orig\..*$ 1.8 +\.orig$ 1.9 +\.chg\..*$ 1.10 +\.rej$ 1.11 +\.conflict\~$