tests/simple-merge
changeset 165 7fc8385df514
parent 28 9f64ee817199