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

File last commit:

r22023:f1883065 default
r23048:ee5f8340 merge stable
Show More
test-simplemerge.py.out
5 lines | 115 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
................
----------------------------------------------------------------------
Ran 16 tests in 0.000s
OK