tests/simple-merge
changeset 144 ea9188538222
parent 28 9f64ee817199