##// END OF EJS Templates
demandimport: ignore _winreg (used in python-2.7 mimetypes)
r10242:ecd0a5c8 stable
Show More
test-merge4.out
4 lines | 194 B | text/plain | TextLexer
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)