tests/test-double-merge
changeset 5402 ad0b580cad35
parent 5057 99a4592ea886