tests/test-revlog-ancestry.py.out

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 5
4 2 0 
Ancestors of 6 and 5
3 4 2 1 0 
Ancestors of 5 and 4
4 2 0 

Descendants of 5
7 8 
Descendants of 5 and 3
6 7 8 
Descendants of 5 and 4
5 7 8