##// END OF EJS Templates
Merge pull request #9825 from Carreau/no-overwrite-master...
Merge pull request #9825 from Carreau/no-overwrite-master Do not update the unders if they are user defined

File last commit:

r7846:e288666b
r22854:4564091b merge
Show More
.gitattributes
5 lines | 109 B | text/plain | TextLexer
IPython/.git_commit_info.ini export-subst
* text=auto
*.py diff=python
*.js diff=javascript
*.html diff=html