##// END OF EJS Templates
merge: never do premerge on symlinks...
merge: never do premerge on symlinks Simplemerge is not symlink aware and will never do the right thing on symlinks.

File last commit:

r14765:08ef6b5f stable
r18257:a35d0128 default
Show More
test-wireproto.py.out
2 lines | 47 B | text/plain | TextLexer
/ tests / test-wireproto.py.out
Hello, Foobar
['Hello, Fo, =;o', 'Hello, Bar']