tests/test-double-merge
changeset 5407 d7e7902bb190
parent 5057 99a4592ea886