tests/simple-merge
changeset 151 1f6c61a60586
parent 28 9f64ee817199