tests/simple-merge
changeset 96 fce47326677c
parent 28 9f64ee817199