tests/test-merge-revert2

--- a/tests/test-merge-revert2	Thu Apr 26 23:58:18 2007 -0700
+++ b/tests/test-merge-revert2	Sat Apr 28 17:55:45 2007 -0300
@@ -27,7 +27,7 @@
 hg update -C 0
 echo "changed file1 different" >> file1
 hg update
-hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
+hg diff --nodates
 hg status
 hg id
 hg revert --no-backup --all