tests/simple-merge
changeset 93 0b0efe409d79
parent 28 9f64ee817199