tests/simple-merge
changeset 56 ad2ea1185f04
parent 28 9f64ee817199