tests/test-merge-revert
changeset 5437 71e7c86adcb7
parent 4361 46280c004f22