--- a/.hgignore Sat Apr 05 10:12:51 2014 +0200 +++ b/.hgignore Sat Apr 05 17:52:29 2014 +0100 @@ -3,6 +3,7 @@ *~ *.class *.jar +*.marks *.orig *.rej .DS_Store