tests/test-simplemerge.py.out

test-merge5: removed unnecessary parts of test

- no need to initialize a new directory
- no need to fix the commit time, already done by run-tests
- no need to exit 0, use exit code from hg instead
- better spacing around comments

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

OK