tests/simple-merge
changeset 161 0b4c5cb953d9
parent 28 9f64ee817199