tests/simple-merge
changeset 219 8ff4532376a4
parent 28 9f64ee817199