diff options
author | Manuel Jacob <unknown> | 2013-08-26 01:49:13 +0100 |
---|---|---|
committer | Manuel Jacob <unknown> | 2013-08-26 01:49:13 +0100 |
commit | 6bbfafab875103969e235754e257f2de7db45f6a (patch) | |
tree | 3c5b9cdcde6592fdc21730aa540fc2b9952a2b2e /.hgignore | |
parent | hg merge default (diff) | |
parent | missing import (diff) | |
download | pypy-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-- | .hgignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,6 +6,7 @@ syntax: glob .idea .project .pydevproject +__pycache__ syntax: regexp ^testresult$ |