##// END OF EJS Templates
Update win32 merge tools configuration...
Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

File last commit:

r6138:09847b90 default
r7665:950484f0 default
Show More
test-issue352.out
14 lines | 316 B | text/plain | TextLexer
adding he llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
adding he llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
f he llo he llo
f hell
o hell
o