##// END OF EJS Templates
merge with stable
r16353:1d8eab6d merge default
Show More
test-simplemerge.py.out
5 lines | 119 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s
OK