test-merge-types: allow different output with existing hgmerge (issue3346)
Because hgmerge was meant to be adjusted to personal needs, there may be
many remaining copies in people's $PATH.
Ancestors of 54 2 0 Ancestors of 6 and 53 4 2 1 0 Ancestors of 5 and 44 2 0 Descendants of 57 8 Descendants of 5 and 36 7 8 Descendants of 5 and 45 7 8