tests/test-double-merge
changeset 5446 fa836e050c50
parent 5057 99a4592ea886