tests/simple-merge
changeset 306 f06a4a3b86a7
parent 28 9f64ee817199