##// END OF EJS Templates
tests: fix 05210e955bef merge error in test-git-import.t
tests: fix 05210e955bef merge error in test-git-import.t

File last commit:

r4363:2e3c54fb default
r12586:b96de59a 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