##// END OF EJS Templates
merge default into stable for 1.8 code freeze
merge default into stable for 1.8 code freeze

File last commit:

r4363:2e3c54fb default
r13427:2432b322 merge stable
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