--- a/.hgignore Sat Jan 26 14:49:54 2013 +0100 +++ b/.hgignore Sat Jan 26 15:48:59 2013 +0100 @@ -0,0 +1,5 @@ +\.orig\..*$ +\.orig$ +\.chg\..*$ +\.rej$ +\.conflict\~$