filemerge: introduce :x as short version of internal:x merge tool name
"internal:" is so much typing - it is frequently specified on the command line
and gives options that are longer than any other I have seen.
branches: merge white space to format string
Diffs of test output should be harmless. A white space character is moved
into "log.changeset" color region.