tests/simple-merge
changeset 173 8da1df932c16
parent 28 9f64ee817199