tests/test-simplemerge.py.out

ui: add 'force' parameter to traceback() to override the current print setting

This will allow a current traceback.print_exc() call in dispatch to be replaced
with ui.traceback() even if --traceback was not given on the command line.

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

OK