X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=.hgignore;fp=.hgignore;h=7454a0990a6b0dacbc60537eb2b72b220fc35e4e;hp=247007cbe1c97d9bf61cb7b26777243d14f9095f;hb=d68ba6e44800ba2c2f0da1f4b5d6be588b30079f;hpb=22e885262e66e14adb858c35e38f022d86378b13

diff --git a/.hgignore b/.hgignore
index 247007c..7454a09 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,12 @@
-^nbactions\.xml$
+syntax: regexp
+
+\.orig$
+\.orig\..*$
+\.chg\..*$
+\.rej$
+\.conflict\~$
+^maven-build\.properties$
+^maven-build\.xml$
 ^nb-configuration\.xml$
+^nbactions\.xml$
 ^target$