Mercurial > hgweb.cgi > hwm

changeset 43:07bcb9eb53f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added files generated during a merge. IN: -
author John Schneiderman <JohnMS@CodeGNU.com>
date Thu, 21 Aug 2014 17:45:43 -0500
parents 214faa2a98c7
children b19cfcba5dfa
files data/ignores.xml
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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">