##// END OF EJS Templates
[merge] Merging with upstream trunk.
[merge] Merging with upstream trunk.

File last commit:

r736:d53b34f4
r2107:3611aca7 merge
Show More
.hgignore
18 lines | 161 B | text/plain | TextLexer
syntax: glob
*~
*.tmp
*.pyc
*.bak
*.tgz
*.org
*.rej
.svn/
.bzr/
.settings/
.project
*.diff
IPython_crash_report.txt
syntax: regexp
.*\#.*\#$