##// END OF EJS Templates
use cfg._merge instead of update in loader...
use cfg._merge instead of update in loader update clobbers existing config sections IPython.config tests are passing again

File last commit:

r3217:5a3e42fd
r4606:542d6a8b
Show More
.gitattributes
2 lines | 54 B | text/plain | TextLexer
Fernando Perez
Add support for commit information in auto-generated archives....
r3199 IPython/.git_commit_info.ini export-subst
Darren Dale
update .gitattributes to normalize line endings
r3217 * text=auto