tests/test-merge-force
changeset 8767 b03859265cc4
parent 6256 69c75d063c7a