tests/test-filelog.py.out

filemerge: deindent the parts of filemerge outside the try block

It is no longer necessary to indent these parts.

ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.