tests/simple-merge
changeset 167 fad9ad1ec7c7
parent 28 9f64ee817199