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.
abort: repository a not found!
255
abort: error: Connection refused
255
abort: repository a not found!
255
abort: destination '../a' already exists
255
abort: repository a not found!
255
destination directory: q
abort: destination 'q' already exists