tests/test-double-merge
changeset 5364 5737845fd974
parent 5057 99a4592ea886