tests/test-merge-revert
changeset 2560 c35694df7b13
parent 1933 7544700fd931
child 2982 890e285c52a1