tests/simple-merge
changeset 180 f25944662097
parent 28 9f64ee817199