##// 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:

r2536:8106e477 default
r4387:93a4e72b default
Show More
test-oldcgi.out
3 lines | 6 B | text/plain | TextLexer
0
0
0