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
% test issue352
adding he
llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
adding he
llo
abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
adding hell
o
abort: '\n' and '\r' disallowed in filenames: 'hell\no'
f he
llo he
llo
f hell
o hell
o
% test issue2039
[0;35;1;4m? foo[0m
[0;35;1;4mbar[0m
[0;35;1;4m? foo[0m
[0;35;1;4mbar.baz[0m