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

r3368:751df21d default
r4387:93a4e72b default
Show More
binfile.bin
0 lines | 593 B | application/octet-stream | TextLexer
/ tests / binfile.bin
Binary file (application/octet-stream)