aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Jacob <unknown>2013-08-26 01:49:13 +0100
committerManuel Jacob <unknown>2013-08-26 01:49:13 +0100
commit6bbfafab875103969e235754e257f2de7db45f6a (patch)
tree3c5b9cdcde6592fdc21730aa540fc2b9952a2b2e /.hgignore
parenthg merge default (diff)
parentmissing import (diff)
downloadpypy-6bbfafab875103969e235754e257f2de7db45f6a.tar.gz
pypy-6bbfafab875103969e235754e257f2de7db45f6a.tar.bz2
pypy-6bbfafab875103969e235754e257f2de7db45f6a.zip
hg merge default: probably the most annoying merge I ever did.
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 6494c4f68d..428cf73a16 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,6 +6,7 @@ syntax: glob
.idea
.project
.pydevproject
+__pycache__
syntax: regexp
^testresult$