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

File last commit:

r22023:f1883065 default
r29605:519bb4f9 merge 3.9-rc 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