changeset 3220 | 403ebd4d92d7 |
parent 3192 | 096f1c73cdc3 |
child 3988 | 9dcf9d45cab8 |
--- a/tests/test-merge-revert2 +++ b/tests/test-merge-revert2 @@ -27,8 +27,7 @@ hg id hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -#hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" -hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg status hg id hg revert --no-backup --all