tests/simple-merge
changeset 76 d993ebd69d28
parent 28 9f64ee817199