# HG changeset patch
# User John Schneiderman <JohnMS@CodeGNU.com>
# Date 1408661143 18000
# Node ID 07bcb9eb53f794b61cd68da9d236b8a4e2135b9f
# Parent  214faa2a98c7f2a992309498d00b1472197f10ec
Added files generated during a merge. IN: -

diff -r 214faa2a98c7 -r 07bcb9eb53f7 data/ignores.xml
--- a/data/ignores.xml	Wed Aug 13 19:05:51 2014 -0500
+++ b/data/ignores.xml	Thu Aug 21 17:45:43 2014 -0500
@@ -26,6 +26,9 @@
 		<pattern description="Temporaries" type="regex">
 			(.*\.(tmp|swp)|tmp)
 		</pattern>
+		<pattern description="Mercurial Merge Files" type="glob">
+			*.{rej,orig,patch}
+		</pattern>
 	</group>
 	<group name="Python">
 		<pattern description="Compiled Scripts" type="regex">