tests/simple-merge
changeset 120 bae6f0328f63
parent 28 9f64ee817199