tests/test-merge-revert
changeset 5071 35d47b06d4e3
parent 4361 46280c004f22