tests/test-merge-local
changeset 5378 8a2915f57dfc
parent 4361 46280c004f22