tests/test-merge-revert
changeset 5251 37c610c41ed6
parent 4361 46280c004f22