author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Mon, 02 Oct 2006 08:40:26 +0200 | |
changeset 3221 | 7feeb6517d96 |
parent 3220 | 403ebd4d92d7 (diff) |
parent 3219 | 618a7f2c1b82 (current diff) |
child 3222 | 3bd3a98b4921 |
--- 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