tests/test-double-merge
changeset 8970 eac360045ba4
parent 8834 6d36fc70754e