tests/test-merge-revert
changeset 3836 925b1816c746
parent 2982 890e285c52a1
child 3988 9dcf9d45cab8