tests/test-double-merge
changeset 10974 854ac04d712c
parent 8834 6d36fc70754e