summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-12 16:02:15 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-12 16:02:15 -0400
commitb4cf5c0c244d2280b729e6951da2128f00e960b6 (patch)
tree8e7cd50a157bae478e6fcb6627948e4994f02068 /.hgignore
parentac50379957b3f8bf03f0604dc3319c14e73ce657 (diff)
parent172b45d5a217c7cdb922f49706b310edc412fc28 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 403b73df6d..94391e11ab 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
syntax: glob
+
# WinMerge temp files
*.bak
# Compiled python bytecode