summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
committerDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
commitdb5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch)
treeebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /.hgignore
parent1d8f117069945499ac297ef13eb6a916a2b96d72 (diff)
parented72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index bc3020eee4..501f9e6abe 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
syntax: glob
+
# WinMerge temp files
*.bak
# Compiled python bytecode