##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r4363:2e3c54fb default
r6018:404be894 merge default
Show More
test-simplemerge.py.out
5 lines | 119 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
Alexis S. L. Carvalho
actually port simplemerge to hg...
r4363 ....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s
OK