# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java
--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Base (1.23)
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Locally Modified (Based On 1.23)
@@ -104,7 +104,7 @@
     
     // IGNORE SUPPORT HG: following file patterns are added to {Hg repos}/.hgignore and Hg will ignore any files
     // that match these patterns, reporting "I"status for them // NOI18N
-    private static final String [] HG_IGNORE_FILES = { "\\.orig$", "\\.rej$"}; // NOI18N
+    private static final String [] HG_IGNORE_FILES = { "\\.orig$", "\\.orig\\..*$", "\\.chg\\..*$", "\\.rej$"}; // NOI18N
     
     private static final String FILENAME_HGIGNORE = ".hgignore"; // NOI18N