tests/test-merge-revert
changeset 4854 fc389dcc33f5
parent 4361 46280c004f22