tests/test-simplemerge.py.out

tests: allow cvs import to reorder its filename list

Also fix script to generate non-zero length test file b.

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK