tests/test-merge-force
changeset 8998 d86471eca74d
parent 6256 69c75d063c7a