summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 403b73df6d..501f9e6abe 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
syntax: glob
+
# WinMerge temp files
*.bak
# Compiled python bytecode
@@ -67,3 +68,4 @@ glob:indra/newview/filters.xml
glob:indra/newview/avatar_icons_cache.txt
glob:indra/newview/avatar_lad.log
glob:*.diff
+*.rej