##// END OF EJS Templates
run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

File last commit:

r4186:08d31e43 default
r4387:93a4e72b default
Show More
test-issue352.out
14 lines | 272 B | text/plain | TextLexer
/ tests / test-issue352.out
Benoit Boissinot
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
r3607 adding he llo
abort: '\n' and '\r' disallowed in filenames
adding he llo
abort: '\n' and '\r' disallowed in filenames
Alexis S. L. Carvalho
Leave normalization of patterns to util._matcher...
r4186 adding hell
o
abort: '\n' and '\r' disallowed in filenames
adding hell
Benoit Boissinot
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
r3607 o
Alexis S. L. Carvalho
Leave normalization of patterns to util._matcher...
r4186 abort: '\n' and '\r' disallowed in filenames
f he llo he llo
f hell
o hell
o