tests/test-merge-revert
changeset 3865 36a957364b1b
parent 2982 890e285c52a1
child 3988 9dcf9d45cab8