tests/test-merge-local
changeset 5136 9555f3b9489d
parent 4361 46280c004f22