tests/simple-merge
changeset 33 98633e60067c
parent 28 9f64ee817199