tests/test-double-merge
changeset 5388 557e4a916e12
parent 5057 99a4592ea886