diff --git a/.hgignore b/.hgignore
index 6065095bf..2603b9210 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,11 +1,15 @@
-syntax: glob
-trunk/build/*
-trunk/coverage/*
-trunk/dist/*
-trunk/javadoc/*
-trunk/locales/*
-trunk/releases/*
-trunk/reports/*
-trunk/build_exe.xml
-trunk/installer.cfg
-*.orig
+\.orig$ 
+\.orig\..*$ 
+\.chg\..*$ 
+\.rej$ 
+\.conflict\~$
+^trunk/build$
+^trunk/reports$
+^trunk/installer\.cfg$
+^trunk/releases$
+^trunk/locales$
+^trunk/javadoc$
+^trunk/coverage$
+^trunk/dist$
+^trunk/build_exe\.xml$
+^trunk/libsrc/jsyntaxpane/jsyntaxpane/src/target$
\ No newline at end of file