tests/test-double-merge
changeset 5379 d3e51dc804f8
parent 5057 99a4592ea886