tests/test-simplemerge.py.out

test-merge-changedelete.t: print out debugmergestate

We're going to use this to verify the merge state in upcoming patches.

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK