tests/test-merge5.out

Add output markers to test-bundle so it's easier to spot the source of
output diffs.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes