changeset 130:1c96a5080899

Ignore .orig files.
author Thomas P Jakobsen <tpj@cs.au.dk>
date Thu, 29 Oct 2009 16:33:17 +0100
parents e39c14597e02
children 8f4dbf37a96f
files .hgignore
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Oct 29 16:19:47 2009 +0100
+++ b/.hgignore	Thu Oct 29 16:33:17 2009 +0100
@@ -19,6 +19,9 @@
 # Ignore Java class files.
 *.class
 
+# Ignore merge files.
+*.orig
+
 .DS_Store
 .ropeproject/*
 TAGS